search

rgleason / watchdog_pi

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

Which version to use now? #44

Closed rgleason closed 1 year ago

rgleason commented 1 year ago

Watchdog v2.4.53.1 ( branch Update2) has this, but does not show a Pypilot Alarm, but does it have that? Anchor Speed Course Weather Wind Deadman NMEA Data Depth Landfall Boundary Time Boundary Distance Boundary Inclusion Alarm The "New" alarm dialog box could be fixed again with wxFormBuilder. - don't have time really. This version seems to have the same alarms as the earlier version, and no Rudder or Pypilot Alarm.

Anyway, I am going to push this up to my remote branch:update2 as version 2.4.54

Watchdog-2 4 53 1

Watchdog 2.4.51 (branch: master) which we have been using has (no Pypilot Alarm) Anchor Speed Course Weather Wind Deadman NMEA Data Depth Landfall Boundary Time Boundary Distance Boundary Inclusion Alarm

The "New" alarm dialog box is bigger and works better.
The Rudder alarm does not appear to work..

Watchdog-2 4 51

I don't know if I should go back to the current version of watchdog 2.4.51 and simply update that for the time being.

If we decide on version 2.4.51 I will update remote branch:master TP1.0.238 and label it as 2.4.55

rgleason commented 1 year ago

I looked at the files for Watchdog v2.4.53.1 ( branch Update2)

and it does have pypilot alarm code in

pypilot_client.cpp watchdogUI.h class pypilotPanel : public wxPanel watchdogUI.cpp pypilotPanel::~pypilotPanel() NewAlarmDialog.cpp // mlAlarmType->InsertItem(PYPILOT, ("pypilot Alarm")); // mlAlarmType->InsertItem(RUDDER, ("Rudder")); EditAlarmDialog.cpp // void pypilotPanel::OnAboutHardwareErrors( wxCommandEvent& )

I am not sure if this matches what Sean has, but I can check it when I get back.

LATER: Watchdog v2.4.51 +TP1.0.22 ( branch master) also has commented out pypilot code in similar places, but it has this file signalK_client.cpp instead of pypilot_client.cpp

Sean's current version is using pypilot_client.cpp Sean's is 2.4.39.0 + TP 1.0.185.0 fix macos from 2 years ago.

His most recent commit is Feb8 2022 Fix include location fix include location before that on Jan 6 2022 he has fix issues with pypilot alarm.

rgleason commented 1 year ago

Going to push both versions to see if there are any problems with either one.

watchdog 2.4.55 + TP1.0.238 branch: master has pypilot code with signalk_client.cpp

watchdog 2.4.54 + fix bld isnan branch: update2 has pypilot code with pypilot_client.cpp (same as Sean's)

rgleason commented 1 year ago

The problems have been resolved by bdbcat. The plugin is no longer diverging and a PR has been made back to Sean's repos. Everything is in the master branch now.

bdbcat July 30 commits for rudder, pypilot alarm, depth parsing https://github.com/rgleason/watchdog_pi/commit/dd488d0fc6c662cf8de355a3f82b986a723854f9 https://github.com/rgleason/watchdog_pi/commit/76524e3f1732988359ce7af0a3c297d5a9d22147 https://github.com/rgleason/watchdog_pi/commit/5fad00e9e751c5b66be3835bf08a2be9cb7926d2