From af3edf0089b78869103dc4d7c400c618cf8f4866 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 25 Jan 2023 15:42:24 +1100 Subject: [PATCH] AP_HAL_ChibiOS: add and use AP_BATTMON_SMBUS_SOLO_ENABLED --- libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat | 3 +++ libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc | 3 +++ libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat | 3 +++ libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat | 3 +++ 4 files changed, 12 insertions(+) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat index c9da5ea185..4a0c835b91 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat @@ -16,4 +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 + AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc index 67d4f5ee11..885e9f5e5b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc @@ -333,6 +333,9 @@ 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 + # 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 58f2ec2fbf..cf999c9653 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat @@ -57,4 +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 + AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat index 5b04e566ea..52c9a7d720 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat @@ -473,5 +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) + # produce this error if we are on a 1M board define BOARD_CHECK_F427_USE_1M "ERROR: 1M flash use fmuv2"