Merge branch 'autorange'

opencpn-radar-pi · Jun 5, 2018 · d3f0e0f · d3f0e0f
2 parents 136584d + 2d19ec2
commit d3f0e0f
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/RadarInfo.cpp b/src/RadarInfo.cpp
@@ -606,24 +606,24 @@ void RadarInfo::RenderGuardZone() {
   }
 }
 
-void RadarInfo::SetAutoRangeMeters(int meters) {
+void RadarInfo::SetAutoRangeMeters(int autorange_to_set) {
+  int meters = autorange_to_set;
   if (m_state.GetValue() == RADAR_TRANSMIT && m_range.GetState() == RCS_AUTO_1) {
-    // Don't adjust auto range meters continuously when it is oscillating a little bit (< 5%)
+         // Compute a 'standard' distance. This will be slightly smaller.
+    meters = GetNearestRange(meters, m_pi->m_settings.range_units);
+		    // Don't adjust auto range meters continuously when it is oscillating a little bit (< 10%)
     int test = 100 * m_previous_auto_range_meters / meters;
-    if (test < 95 || test > 105) {  //   range change required
-      // Compute a 'standard' distance. This will be slightly smaller.
-      meters = GetNearestRange(meters, m_pi->m_settings.range_units);
+    if (test < 90 || test > 110) {      //   range change required
       if (meters != m_range.GetValue()) {
-        if (m_pi->m_settings.verbose) {
-          LOG_VERBOSE(wxT("radar_pi: Automatic range changed from %d to %d meters"), m_previous_auto_range_meters, meters);
-        }
-        m_control->SetRange(meters);
-        m_previous_auto_range_meters = meters;
-      }
-    }
-  } else {
-    m_previous_auto_range_meters = 0;
-  }
+			  LOG_VERBOSE(wxT("radar_pi: Automatic range changed from %d to %d meters"), m_previous_auto_range_meters, meters);
+				m_control->SetRange(meters);
+				m_previous_auto_range_meters = meters;
+			}
+		}
+	}
+	else {
+		m_previous_auto_range_meters = 0;
+	}
 }
 
 bool RadarInfo::SetControlValue(ControlType controlType, RadarControlItem &item) {