From 0e284b95b08f17547aaa02dc04172e4fb74ce8cd Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 6 Aug 2020 15:33:07 +1000 Subject: [PATCH] GCS_MAVLink: move battery type enumeration out of parameters object --- libraries/GCS_MAVLink/GCS_Common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp index a8d59e7659..1a46838ce7 100644 --- a/libraries/GCS_MAVLink/GCS_Common.cpp +++ b/libraries/GCS_MAVLink/GCS_Common.cpp @@ -267,7 +267,7 @@ bool GCS_MAVLINK::send_battery_status() for(uint8_t i = 0; i < AP_BATT_MONITOR_MAX_INSTANCES; i++) { const uint8_t battery_id = (last_battery_status_idx + 1) % AP_BATT_MONITOR_MAX_INSTANCES; - if (battery.get_type(battery_id) != AP_BattMonitor_Params::BattMonitor_Type::BattMonitor_TYPE_NONE) { + if (battery.get_type(battery_id) != AP_BattMonitor::Type::NONE) { CHECK_PAYLOAD_SIZE(BATTERY_STATUS); send_battery_status(battery_id); last_battery_status_idx = battery_id;