AP_HAL: move battery type enumeration out of parameters object

This commit is contained in:
Peter Barker 2020-08-06 15:33:07 +10:00 committed by Peter Barker
parent 2e3ba2a4d2
commit 26666b4b3d

View File

@ -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