light refactor: remove requirement for neopixel power pin, source it …

…from the board def instead
adafruit · Apr 25, 2022 · 178e95b · 178e95b
1 parent fc0324b
commit 178e95b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
@@ -49,36 +49,31 @@
 #define BOARD_ID "adafruit-magtag-esp32s2"
 #define USE_TINYUSB
 #define USE_STATUS_NEOPIXEL
-#define NEEDS_STATUS_NEOPIXEL_POWER
 #define STATUS_NEOPIXEL_PIN 1
 #define STATUS_NEOPIXEL_NUM 4
 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
 #define BOARD_ID "adafruit-feather-esp32s2"
 #define USE_TINYUSB
 #define USE_STATUS_NEOPIXEL
-#define NEEDS_STATUS_NEOPIXEL_POWER
 #define STATUS_NEOPIXEL_PIN 33
 #define STATUS_NEOPIXEL_NUM 1
 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
 #define BOARD_ID "adafruit-feather-esp32s2-tft"
 #define USE_TINYUSB
 #define USE_STATUS_NEOPIXEL
-#define NEEDS_STATUS_NEOPIXEL_POWER
 #define STATUS_NEOPIXEL_PIN 33
 #define STATUS_NEOPIXEL_NUM 1
 #define PIN_I2C_POWER_INVERTED 7
 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM)
 #define BOARD_ID "adafruit-feather-esp32s3"
 #define USE_TINYUSB
 #define USE_STATUS_NEOPIXEL
-#define NEEDS_STATUS_NEOPIXEL_POWER
 #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
 #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM
 #elif defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
 #define BOARD_ID "adafruit-qtpy-esp32s2"
 #define USE_TINYUSB
 #define USE_STATUS_NEOPIXEL
-#define NEEDS_STATUS_NEOPIXEL_POWER
 #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
 #define STATUS_NEOPIXEL_NUM 1
 #elif defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH)

diff --git a/src/components/statusLED/Wippersnapper_StatusLED.cpp b/src/components/statusLED/Wippersnapper_StatusLED.cpp
@@ -47,17 +47,10 @@ bool Wippersnapper::statusLEDInit() {
   }
 #endif
 
-// some hardware requires the NEOPIXEL_POWER pin to be enabled.
-#ifdef NEEDS_STATUS_NEOPIXEL_POWER
+// Some boards use a NEOPIXEL_POWER pin to set the power
+#if defined(NEOPIXEL_POWER) || defined(NEOPIXEL_POWER)
   pinMode(NEOPIXEL_POWER, OUTPUT);
-#if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) ||                               \
-    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) ||                                  \
-    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) ||                           \
-    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM)
-  digitalWrite(NEOPIXEL_POWER, HIGH);
-#else
-  digitalWrite(NEOPIXEL_POWER, LOW);
-#endif
+  digitalWrite(NEOPIXEL_POWER, NEOPIXEL_POWER_ON);
 #endif
 
 #ifdef USE_STATUS_DOTSTAR