search

seandepagnier / watchdog_pi

watchdog plugin for opencpn
GNU General Public License v3.0
10 stars 19 forks source link

Fix Divergence: from Rg-master branch - Revert rudder and cherry-pick from Sean's master branch #126

Closed rgleason closed 1 year ago

rgleason commented 1 year ago

See https://github.com/seandepagnier/watchdog_pi/issues/123

Note that https://github.com/seandepagnier/watchdog_pi/commit/8093f3a6d3592d60f49b561572805c7744343d8d (origin/rg-master) Revert "Merge pull request https://github.com/seandepagnier/watchdog_pi/pull/38 from pa2wlt/with_rudder"

from my repository branch rg-master https://github.com/rgleason/watchdog_pi/commit/8093f3a6d3592d60f49b561572805c7744343d8d

will need to be redone with a new PR.

rgleason commented 1 year ago

Errors when building for Win with wxWidgets 3.1.2 for OpenCPN 5.6.2

C:\project\ocpn_project\src\watchdog_pi.cpp(111): error C2065: 'm_pypilot_host': undeclared identifier [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  WatchdogDialog.cpp
  WatchdogPropertiesDialog.cpp
  ConfigurationDialog.cpp
  NewAlarmDialog.cpp
  EditAlarmDialog.cpp
  Alarm.cpp
C:\project\ocpn_project\src\Alarm.cpp(113): error C2248: 'DepthPanel::m_cUnits': cannot access protected member declared in class 'DepthPanel' [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  c:\project\ocpn_project\src\WatchdogUI.h(421): note: see declaration of 'DepthPanel::m_cUnits'
  c:\project\ocpn_project\src\WatchdogUI.h(414): note: see declaration of 'DepthPanel'
C:\project\ocpn_project\src\Alarm.cpp(2587): error C2504: 'pypilotClient': base class undefined [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2590): error C2614: 'pypilotAlarm': illegal member initialization: 'SignalKClient' is not a base or member [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2626): error C3861: 'connected': identifier not found [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2665): error C3861: 'connected': identifier not found [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2666): error C2039: 'm_pypilot_host': is not a member of 'watchdog_pi' [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  C:\project\ocpn_project\include\WatchdogDialog.h(48): note: see declaration of 'watchdog_pi'
C:\project\ocpn_project\src\Alarm.cpp(2667): error C2039: 'm_pypilot_host': is not a member of 'watchdog_pi' [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  C:\project\ocpn_project\include\WatchdogDialog.h(48): note: see declaration of 'watchdog_pi'
C:\project\ocpn_project\src\Alarm.cpp(2672): error C2660: 'connect': function does not take 1 arguments [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\include\winsock.h(754): note: see declaration of 'connect' (compiling source file C:\project\ocpn_project\src\Alarm.cpp)
C:\project\ocpn_project\src\Alarm.cpp(2680): error C3861: 'receive': identifier not found [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2688): error C3861: 'connected': identifier not found [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2705): error C3861: 'update_watchlist': identifier not found [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
C:\project\ocpn_project\src\Alarm.cpp(2733): error C2039: 'm_cHost': is not a member of 'pypilotPanel' [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  c:\project\ocpn_project\src\WatchdogUI.h(502): note: see declaration of 'pypilotPanel'
C:\project\ocpn_project\src\Alarm.cpp(2755): error C2039: 'm_cHost': is not a member of 'pypilotPanel' [C:\project\ocpn_project\build\watchdog_pi.vcxproj]
  c:\project\ocpn_project\src\WatchdogUI.h(502): note: see declaration of 'pypilotPanel'
  pypilot_client.cpp