AP_Notify: move defaulting of HAL_DSHOT_ALARM into hwdef

This commit is contained in:
Peter Barker 2022-08-15 15:27:28 +10:00 committed by Peter Barker
parent 0f49b7f3ab
commit 2e8939222d
2 changed files with 2 additions and 2 deletions

View File

@ -354,7 +354,7 @@ void AP_Notify::add_backends(void)
// ChibiOS noise makers
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
ADD_BACKEND(new Buzzer());
#if HAL_PWM_COUNT > 0 || HAL_DSHOT_ALARM
#if HAL_PWM_COUNT > 0 || HAL_DSHOT_ALARM_ENABLED
ADD_BACKEND(new AP_ToneAlarm());
#endif

View File

@ -105,7 +105,7 @@ bool AP_ToneAlarm::init()
if (pNotify->buzzer_enabled() == false) {
return false;
}
#if ((defined(HAL_PWM_ALARM) || defined(HAL_PWM_ALT_ALARM) || HAL_DSHOT_ALARM) && CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS) || \
#if ((defined(HAL_PWM_ALARM) || defined(HAL_PWM_ALT_ALARM) || HAL_DSHOT_ALARM_ENABLED) && CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS) || \
CONFIG_HAL_BOARD == HAL_BOARD_LINUX || \
CONFIG_HAL_BOARD == HAL_BOARD_SITL
if (!hal.util->toneAlarm_init(pNotify->get_buzzer_types())) {