Merge pull request #123 from SamHoulder/garminHD-range_fix

GarminHD range fix
opencpn-radar-pi · Feb 15, 2020 · a75d872 · a75d872
2 parents 9c59723 + 2a49e30
commit a75d872
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/garminhd/GarminHDControl.cpp b/src/garminhd/GarminHDControl.cpp
@@ -179,8 +179,8 @@ bool GarminHDControl::SetRange(int meters) {
 
     packet.packet_type = 0x2b3;
     packet.len1 = sizeof(packet.parm1);
-    packet.parm1 = meters;
-    LOG_VERBOSE(wxT("radar_pi: %s transmit: range %d meters"), m_name.c_str(), meters);
+    packet.parm1 = meters-1;
+    LOG_VERBOSE(wxT("radar_pi: %s transmit: range %d meters"), m_name.c_str(), meters-1);
     return TransmitCmd(&packet, sizeof(packet));
   }
   return false;

diff --git a/src/garminhd/GarminHDReceive.cpp b/src/garminhd/GarminHDReceive.cpp
@@ -106,7 +106,7 @@ void GarminHDReceive::ProcessFrame(radar_line *packet) {
   }
 
   m_ri->m_state.Update(RADAR_TRANSMIT);
-  m_ri->m_range.Update(packet->range_meters);
+  m_ri->m_range.Update(packet->range_meters+1);
   m_ri->m_gain.Update(packet->gain_level[0], packet->gain_level[1] ? RCS_AUTO_1 : RCS_MANUAL);
   m_ri->m_rain.Update(packet->sea_clutter[0], packet->sea_clutter[1] ? RCS_AUTO_1 : RCS_MANUAL);
   m_ri->m_rain.Update(packet->rain_clutter[0]);
@@ -526,8 +526,8 @@ bool GarminHDReceive::ProcessReport(const uint8_t *report, size_t len) {
       }
 
       case 0x2a7: {
-        LOG_VERBOSE(wxT("0x02a7: range %d"), packet->range_meters);  // Range in meters
-        m_ri->m_range.Update(packet->range_meters);
+        LOG_VERBOSE(wxT("0x02a7: range %d"), packet->range_meters+1);  // Range in meters
+        m_ri->m_range.Update(packet->range_meters+1);
 
         LOG_VERBOSE(wxT("0x02a7: gain %d"), packet->gain_level);  // Gain
         m_gain = packet->gain_level;

diff --git a/src/garminhd/garminhdtype.h b/src/garminhd/garminhdtype.h
@@ -15,12 +15,12 @@ PLUGIN_END_NAMESPACE
 // Garmin mixed range is the same as nautical miles, it does not support really short ranges
 #define RANGE_MIXED_RT_GARMIN_HD                                                                                          \
   {                                                                                                                       \
-    1852 / 8, 1852 / 4, 1852 / 2, 1852 * 3 / 4, 1852 * 1, 1852 * 3 / 2, 1852 * 2, 1852 * 3, 1852 * 4, 1852 * 6, 1852 * 8, \
+    232, 1852 / 4, 1852 / 2, 1852 * 3 / 4, 1852 * 1, 1852 * 3 / 2, 1852 * 2, 1852 * 3, 1852 * 4, 1852 * 6, 1852 * 8, \
         1852 * 12, 1852 * 16, 1852 * 24, 1852 * 36, 1852 * 48                                                             \
   }
 #define RANGE_NAUTIC_RT_GARMIN_HD                                                                                         \
   {                                                                                                                       \
-    1852 / 8, 1852 / 4, 1852 / 2, 1852 * 3 / 4, 1852 * 1, 1852 * 3 / 2, 1852 * 2, 1852 * 3, 1852 * 4, 1852 * 6, 1852 * 8, \
+    232, 1852 / 4, 1852 / 2, 1852 * 3 / 4, 1852 * 1, 1852 * 3 / 2, 1852 * 2, 1852 * 3, 1852 * 4, 1852 * 6, 1852 * 8, \
         1852 * 12, 1852 * 16, 1852 * 24, 1852 * 36, 1852 * 48                                                             \
   }