aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AC_Notify: remove use of never-set AP_HAL_PX4 and AP_HAL_VRBRAIN

Browse Source
This commit is contained in:
Peter Barker 2019-01-17 11:19:38 +11:00 committed by Andrew Tridgell
parent 312243142b
commit 1dde70007a
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/AP_Notify/AP_Notify.cpp
View File

@ -49,18 +49,7 @@ AP_Notify *AP_Notify::_instance;
#ifndef BUILD_DEFAULT_LED_TYPE #ifndef BUILD_DEFAULT_LED_TYPE
// PX4 boards // PX4 boards
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS || \
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_PX4_V3 // Has enough memory for Oreo LEDs
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS | Notify_LED_OreoLED)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_PX4_V4
#define HAL_HAVE_PIXRACER_LED
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS)
#else // All other px4 boards use standard devices
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS)
#endif
// ChibiOS and VRBrain boards
#elif CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS || \
CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS) #define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS)
@ -278,13 +267,8 @@ void AP_Notify::add_backends(void)
// Always try and add a display backend // Always try and add a display backend
ADD_BACKEND(new Display()); ADD_BACKEND(new Display());
// Add noise making devices
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || \
CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
ADD_BACKEND(new AP_ToneAlarm());
// ChibiOS noise makers // ChibiOS noise makers
#elif CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#ifdef HAL_BUZZER_PIN #ifdef HAL_BUZZER_PIN
ADD_BACKEND(new Buzzer()); ADD_BACKEND(new Buzzer());
#endif #endif