diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_INA239.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_INA239.cpp index 16328e96f9..94676c02c1 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_INA239.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_INA239.cpp @@ -39,7 +39,7 @@ AP_BattMonitor_INA239::AP_BattMonitor_INA239(AP_BattMonitor &mon, void AP_BattMonitor_INA239::init(void) { - dev = hal.spi->get_device(HAL_BATTMON_INA239_SPI_DEVICE); + dev = hal.spi->get_device(AP_BATTERY_INA239_SPI_DEVICE); if (!dev) { GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "device fail"); return; diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat index 9285b6686f..4e821c7054 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat @@ -161,7 +161,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 256 # save some flash include ../include/minimal_GPS.inc include ../include/save_some_flash.inc -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat index 6ac6623d70..6c6b54b60b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat @@ -65,7 +65,7 @@ include ../include/save_some_flash.inc define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # only include ublox GPS driver include ../include/minimal_GPS.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat index 4a0c835b91..0266753fe1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat @@ -16,7 +16,7 @@ define AP_NOTIFY_OREOLED_ENABLED 1 undef HAL_SOLO_GIMBAL_ENABLED define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED -undef AP_BATTMON_SMBUS_SOLO_ENABLED -define AP_BATTMON_SMBUS_SOLO_ENABLED AP_BATTMON_SMBUS_ENABLE +undef AP_BATTERY_SMBUS_SOLO_ENABLED +define AP_BATTERY_SMBUS_SOLO_ENABLED AP_BATTERY_SMBUS_ENABLED AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc index 74e54d2532..a8bbaf8c45 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc @@ -328,8 +328,8 @@ DMA_NOSHARE SPI1* SPI4* USART6* define AP_NOTIFY_OREOLED_ENABLED 1 define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED -undef AP_BATTMON_SMBUS_SOLO_ENABLED -define AP_BATTMON_SMBUS_SOLO_ENABLED AP_BATTMON_SMBUS_ENABLE +undef AP_BATTERY_SMBUS_SOLO_ENABLED +define AP_BATTERY_SMBUS_SOLO_ENABLED AP_BATTERY_SMBUS_ENABLED # Enable Sagetech MXS ADSB transponder define HAL_ADSB_SAGETECH_MXS_ENABLED HAL_ADSB_ENABLED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat index cf999c9653..8f15b713ac 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat @@ -57,7 +57,7 @@ define HAL_IMU_TEMP_MARGIN_LOW_DEFAULT 5 undef HAL_SOLO_GIMBAL_ENABLED define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED -undef AP_BATTMON_SMBUS_SOLO_ENABLED -define AP_BATTMON_SMBUS_SOLO_ENABLED AP_BATTMON_SMBUS_ENABLE +undef AP_BATTERY_SMBUS_SOLO_ENABLED +define AP_BATTERY_SMBUS_SOLO_ENABLED AP_BATTERY_SMBUS_ENABLED AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index d0d3a9b592..f990a435fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -163,7 +163,7 @@ define HAL_BATT_CURR_SCALE 25 # minimal drivers to reduce flash usage include ../include/minimal.inc -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 # enable IMU fast sampling define HAL_DEFAULT_INS_FAST_SAMPLE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 8a71c48508..9b2258590d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -170,4 +170,4 @@ define HAL_PARACHUTE_ENABLED 0 # minimal drivers to reduce flash usage include ../include/minimal.inc define HAL_SPRAYER_ENABLED 0 -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat index 38b3fb4a24..81c2f5e504 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat @@ -155,7 +155,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 1024 define HAL_GYROFFT_ENABLED 0 # --------------------- save flash ---------------------- -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 define AP_BATT_MONITOR_MAX_INSTANCES 1 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat index 5d5579140c..bfb5b16c1f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat @@ -41,7 +41,7 @@ define STM32_PWM_USE_ADVANCED TRUE # save some flash include ../include/save_some_flash.inc -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define HAL_MOUNT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 3411bc4e8b..b3a4f7bdbd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -150,7 +150,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS battery monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 20df97c8ad..a29da22d0e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -156,7 +156,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS battery monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat index 60ef8e1e49..127439f7c8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat @@ -169,7 +169,7 @@ define HAL_BATT2_VOLT_SCALE 11.0 include ../include/minimize_features.inc include ../include/minimal_GPS.inc -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 # reduce max size of embedded params for apj_tool.py diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat index 99731dfb3a..4a9cb2fe92 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat @@ -180,7 +180,7 @@ define HAL_GYROFFT_ENABLED 0 # --------------------- save flash ---------------------- # save some flash include ../include/save_some_flash.inc -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define AP_GRIPPER_ENABLED 0 @@ -190,4 +190,4 @@ define HAL_NMEA_OUTPUT_ENABLED 0 define HAL_BUTTON_ENABLED 0 define AP_NOTIFY_OREOLED_ENABLED 0 define HAL_PICCOLO_CAN_ENABLE 0 -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 6b38adc1a2..ffd02b700b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -185,7 +185,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS battery monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 @@ -198,8 +198,8 @@ define HAL_GYROFFT_ENABLED 0 # save some flash include ../include/save_some_flash.inc define AP_GRIPPER_ENABLED 0 -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define HAL_RUNCAM_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat index ffe431de69..a3cb328672 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat @@ -160,7 +160,7 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin # disable SMBUS battery monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat index 6842b6ecc0..633a185624 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-BattMon/hwdef.dat @@ -4,8 +4,8 @@ define CAN_APP_NODE_NAME "org.ardupilot.MatekL431-BattMon" # enable battery monitor define HAL_PERIPH_ENABLE_BATTERY -define HAL_BATTMON_INA239_ENABLED 1 -define HAL_BATTMON_INA239_SPI_DEVICE "INA23X" +define AP_BATTERY_INA239_ENABLED 1 +define AP_BATTERY_INA239_SPI_DEVICE "INA23X" define HAL_BATT_MONITOR_DEFAULT 26 define AP_PERIPH_BATTERY_MODEL_NAME "MatekL431-BattMon" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat index 9f3eb2d951..2fb20359f1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat @@ -126,7 +126,7 @@ define HAL_I2C_INTERNAL_MASK 0 define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # disable SMBUS monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat index af90eec775..1dea1a0132 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat @@ -151,5 +151,6 @@ include ../include/minimal.inc define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 -define AP_BATTMON_SMBUS_ENABLE 0 -define AP_BATTMON_FUEL_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 +define AP_BATTERY_FUELFLOW_ENABLED 0 +define AP_BATTERY_FUELLEVEL_PWM_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat index 52c9a7d720..02c1261267 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat @@ -473,8 +473,8 @@ ROMFS io_firmware.bin Tools/IO_Firmware/iofirmware_lowpolh.bin define AP_NOTIFY_OREOLED_ENABLED (BOARD_FLASH_SIZE > 1024) define HAL_SOLO_GIMBAL_ENABLED (HAL_MOUNT_ENABLED && BOARD_FLASH_SIZE > 1024) -undef AP_BATTMON_SMBUS_SOLO_ENABLED -define AP_BATTMON_SMBUS_SOLO_ENABLED (AP_BATTMON_SMBUS_ENABLE && BOARD_FLASH_SIZE > 1024) +undef AP_BATTERY_SMBUS_SOLO_ENABLED +define AP_BATTERY_SMBUS_SOLO_ENABLED (AP_BATTERY_SMBUS_ENABLED && BOARD_FLASH_SIZE > 1024) # produce this error if we are on a 1M board define BOARD_CHECK_F427_USE_1M "ERROR: 1M flash use fmuv2" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index 46cf1d5d87..eb604ce602 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -153,7 +153,7 @@ define STM32_PWM_USE_ADVANCED TRUE ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin # disable SMBUS monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 @@ -164,7 +164,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 1024 # save some flash include ../include/save_some_flash.inc -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 # only include ublox GPS driver include ../include/minimal_GPS.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat index 3205adba6c..67e5a12473 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat @@ -20,7 +20,7 @@ define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" # disable SMBUS monitors to save flash -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_SMBUS_ENABLED 0 # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index 2df4ac1f80..b945562ab9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -2992,8 +2992,8 @@ def add_apperiph_defaults(f): #endif // disable various battery monitor backends: -#ifndef AP_BATTMON_SYNTHETIC_CURRENT_ENABLED -#define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +#ifndef AP_BATTERY_SYNTHETIC_CURRENT_ENABLED +#define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 #endif #ifndef AP_BATT_MONITOR_MAX_INSTANCES diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat index f9b0b6c748..ad741c8750 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat @@ -78,8 +78,8 @@ define GPS_MOVING_BASELINE 0 define HAL_ADSB_SAGETECH_ENABLED 0 define HAL_ADSB_UAVIONIX_MAVLINK_ENABLED 0 define AP_AIS_ENABLED 0 -define HAL_BATTMON_INA2XX_ENABLED 0 -define AP_BATTMON_SMBUS_ENABLE 0 +define AP_BATTERY_BACKEND_DEFAULT_ENABLED 0 +define AP_BATTERY_ANALOG_ENABLED 1 define HAL_CRSF_TELEM_ENABLED 0 define HAL_EFI_ENABLED 0 define HAL_EXTERNAL_AHRS_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index 295e5253a5..dade03f6fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -148,4 +148,4 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimal.inc -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat index 2c9af106d8..fdb413b97a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat @@ -155,4 +155,4 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimal.inc -define AP_BATTMON_SYNTHETIC_CURRENT_ENABLED 0 +define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0