AP_Notify: change OREOLED config to ifdef

hughhugh · Apr 21, 2016 · d2ca2d2 · d2ca2d2
1 parent 06ccf88
commit d2ca2d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp
@@ -65,12 +65,14 @@ struct AP_Notify::notify_events_type AP_Notify::events;
     AP_BoardLED boardled;
     ToshibaLED_PX4 toshibaled;
     ToneAlarm_PX4 tonealarm;
-#if OREOLED_ENABLED
+
+#ifdef OREOLED_ENABLED
     OreoLED_PX4 oreoled;
     NotifyDevice *AP_Notify::_devices[] = {&boardled, &toshibaled, &tonealarm, &oreoled};
 #else
     NotifyDevice *AP_Notify::_devices[] = {&boardled, &toshibaled, &tonealarm};
 #endif
+
 #elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
     Buzzer buzzer;
 #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_VRBRAIN_V45

diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h
@@ -22,10 +22,6 @@
 
 #include "NotifyDevice.h"
 
-#ifndef OREOLED_ENABLED
- # define OREOLED_ENABLED   0   // set to 1 to enable OreoLEDs
-#endif
-
 // Device parameters values
 #define RGB_LED_OFF     0
 #define RGB_LED_LOW     1