AP_Notify: change BUILD_DEFAULT_LED_TYPE to new pattern

This commit is contained in:
Henry Wurzburg 2023-04-24 07:47:59 -05:00 committed by Peter Barker
parent 1f4f3bf32a
commit d8247d35f5

View File

@ -64,21 +64,21 @@ AP_Notify *AP_Notify::_singleton;
#define I2C_LEDS (ALL_TOSHIBALED_I2C | ALL_NCP5623_I2C) #define I2C_LEDS (ALL_TOSHIBALED_I2C | ALL_NCP5623_I2C)
#ifndef BUILD_DEFAULT_LED_TYPE #ifndef DEFAULT_NTF_LED_TYPES
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS) #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS)
// Linux boards // Linux boards
#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX #elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS |\ #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS |\
Notify_LED_PCA9685LED_I2C_External) Notify_LED_PCA9685LED_I2C_External)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO2 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO2
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS) #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS |\ #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS |\
Notify_LED_DroneCAN) Notify_LED_DroneCAN)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \
@ -88,22 +88,22 @@ AP_Notify *AP_Notify::_singleton;
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BH || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1 CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_OBAL_V1
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board) #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RST_ZYNQ
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_ToshibaLED_I2C_External) #define DEFAULT_NTF_LED_TYPES (Notify_LED_ToshibaLED_I2C_External)
#else // other linux #else // other linux
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS) #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS)
#endif #endif
// All other builds // All other builds
#else #else
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS) #define DEFAULT_NTF_LED_TYPES (Notify_LED_Board | I2C_LEDS)
#endif // board selection #endif // board selection
#endif // BUILD_DEFAULT_LED_TYPE #endif // DEFAULT_NTF_LED_TYPES
#ifndef BUZZER_ENABLE_DEFAULT #ifndef BUZZER_ENABLE_DEFAULT
#if HAL_CANMANAGER_ENABLED #if HAL_CANMANAGER_ENABLED
@ -196,7 +196,7 @@ const AP_Param::GroupInfo AP_Notify::var_info[] = {
// @Description: Controls what types of LEDs will be enabled // @Description: Controls what types of LEDs will be enabled
// @Bitmask: 0:Built-in LED, 1:Internal ToshibaLED, 2:External ToshibaLED, 3:External PCA9685, 4:Oreo LED, 5:DroneCAN, 6:NCP5623 External, 7:NCP5623 Internal, 8:NeoPixel, 9:ProfiLED, 10:Scripting, 11:DShot, 12:ProfiLED_SPI // @Bitmask: 0:Built-in LED, 1:Internal ToshibaLED, 2:External ToshibaLED, 3:External PCA9685, 4:Oreo LED, 5:DroneCAN, 6:NCP5623 External, 7:NCP5623 Internal, 8:NeoPixel, 9:ProfiLED, 10:Scripting, 11:DShot, 12:ProfiLED_SPI
// @User: Advanced // @User: Advanced
AP_GROUPINFO("LED_TYPES", 6, AP_Notify, _led_type, BUILD_DEFAULT_LED_TYPE), AP_GROUPINFO("LED_TYPES", 6, AP_Notify, _led_type, DEFAULT_NTF_LED_TYPES),
// @Param: BUZZ_ON_LVL // @Param: BUZZ_ON_LVL
// @DisplayName: Buzzer-on pin logic level // @DisplayName: Buzzer-on pin logic level