From fe8730497aaaa4f65f2b42be214c9e19f2bca92d Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 4 Dec 2014 15:51:40 +0900 Subject: [PATCH] Rover: use battery.has_current --- APMrover2/GCS_Mavlink.pde | 2 +- APMrover2/setup.pde | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/APMrover2/GCS_Mavlink.pde b/APMrover2/GCS_Mavlink.pde index 4bf45738f2..550de9fc0c 100644 --- a/APMrover2/GCS_Mavlink.pde +++ b/APMrover2/GCS_Mavlink.pde @@ -177,7 +177,7 @@ static NOINLINE void send_extended_status1(mavlink_channel_t chan) int16_t battery_current = -1; int8_t battery_remaining = -1; - if (battery.monitoring() == AP_BATT_MONITOR_VOLTAGE_AND_CURRENT) { + if (battery.has_current()) { battery_remaining = battery.capacity_remaining_pct(); battery_current = battery.current_amps() * 100; } diff --git a/APMrover2/setup.pde b/APMrover2/setup.pde index 547ae02616..7bc62c6642 100644 --- a/APMrover2/setup.pde +++ b/APMrover2/setup.pde @@ -467,9 +467,13 @@ static void report_batt_monitor() //print_blanks(2); cliSerial->printf_P(PSTR("Batt Mointor\n")); print_divider(); - if(battery.monitoring() == AP_BATT_MONITOR_DISABLED) cliSerial->printf_P(PSTR("Batt monitoring disabled")); - if(battery.monitoring() == AP_BATT_MONITOR_VOLTAGE_ONLY) cliSerial->printf_P(PSTR("Monitoring batt volts")); - if(battery.monitoring() == AP_BATT_MONITOR_VOLTAGE_AND_CURRENT) cliSerial->printf_P(PSTR("Monitoring volts and current")); + if (battery.num_instances() == 0) { + cliSerial->printf_P(PSTR("Batt monitoring disabled")); + } else if (!battery.has_current()) { + cliSerial->printf_P(PSTR("Monitoring batt volts")); + } else { + cliSerial->printf_P(PSTR("Monitoring volts and current")); + } print_blanks(2); } static void report_radio()