From 26666b4b3de3a8faf9cf8da333a0381646d07408 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 6 Aug 2020 15:33:07 +1000 Subject: [PATCH] AP_HAL: move battery type enumeration out of parameters object --- libraries/AP_HAL/board/linux.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL/board/linux.h b/libraries/AP_HAL/board/linux.h index 84588869ab..b191bad970 100644 --- a/libraries/AP_HAL/board/linux.h +++ b/libraries/AP_HAL/board/linux.h @@ -78,7 +78,7 @@ * 240x240 crop rescaled to 64x64 */ #define HAL_FLOW_PX4_FOCAL_LENGTH_MILLIPX (2.21 / (3.6 * 2.0 * 240 / 64)) #define HAL_RANGEFINDER_LIGHTWARE_I2C_BUS 0 - #define HAL_BATT_MONITOR_DEFAULT AP_BattMonitor_Params::BattMonitor_TYPE_BEBOP + #define HAL_BATT_MONITOR_DEFAULT AP_BattMonitor::Type::BEBOP #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO #define HAL_BOARD_LOG_DIRECTORY "/data/ftp/internal_000/ardupilot/logs" #define HAL_BOARD_TERRAIN_DIRECTORY "/data/ftp/internal_000/ardupilot/terrain" @@ -115,7 +115,7 @@ #define HAL_RANGEFINDER_LIGHTWARE_I2C_BUS 0 // the disco has challenges with its magnetic setup #define AP_COMPASS_OFFSETS_MAX_DEFAULT 2200 - #define HAL_BATT_MONITOR_DEFAULT AP_BattMonitor_Params::BattMonitor_TYPE_BEBOP + #define HAL_BATT_MONITOR_DEFAULT AP_BattMonitor::Type::BEBOP #define HAL_GPIO_SCRIPT "/data/ftp/internal_000/ardupilot/gpio.sh" #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #define HAL_GPIO_A_LED_PIN 0