Browse Source

AP_RSSI: use is_zero and add break for avoid compile warning

mission-4.1.18
Randy Mackay 10 years ago
parent
commit
9a648117a7
  1. 5
      libraries/AP_RSSI/AP_RSSI.cpp

5
libraries/AP_RSSI/AP_RSSI.cpp

@ -122,6 +122,7 @@ float AP_RSSI::read_receiver_rssi() @@ -122,6 +122,7 @@ float AP_RSSI::read_receiver_rssi()
break;
default :
receiver_rssi = 0.0f;
break;
}
return receiver_rssi;
@ -157,8 +158,8 @@ float AP_RSSI::read_channel_rssi() @@ -157,8 +158,8 @@ float AP_RSSI::read_channel_rssi()
// Scale and constrain a float rssi value to 0.0 to 1.0 range
float AP_RSSI::scale_and_constrain_float_rssi(float current_rssi_value, float low_rssi_range, float high_rssi_range)
{
float rssi_value_range = abs(high_rssi_range - low_rssi_range);
if ((int)rssi_value_range == (int)0) {
float rssi_value_range = fabsf(high_rssi_range - low_rssi_range);
if (is_zero(rssi_value_range)) {
// User range isn't meaningful, return 0 for RSSI (and avoid divide by zero)
return 0.0f;
}

Loading…
Cancel
Save