Merge pull request #843 from adafruit/funhouse-dotstar-colour-order

Fix DotStar color format for FunHouse status pixels

Author: tyeth

src/Wippersnapper_Boards.h

@@ -41,7 +41,7 @@
 #define STATUS_DOTSTAR_PIN_DATA PIN_DOTSTAR_DATA ///< DotStar Data Pin
 #define STATUS_DOTSTAR_PIN_CLK PIN_DOTSTAR_CLOCK ///< DotStar Clock Pin
 #define STATUS_DOTSTAR_NUM 5                     ///< Number of DotStar LEDs
-#define STATUS_DOTSTAR_COLOR_ORDER DOTSTAR_GBR   ///< DotStar Color Order
+#define STATUS_DOTSTAR_COLOR_ORDER DOTSTAR_BGR   ///< DotStar Color Order
 #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
 #elif defined(ARDUINO_METRO_ESP32S2)
 #define BOARD_ID "metroesp32s2"

src/components/statusLED/Wippersnapper_StatusLED.cpp

@@ -25,7 +25,7 @@ Adafruit_NeoPixel *statusPixel = new Adafruit_NeoPixel(
 #ifdef USE_STATUS_DOTSTAR
 Adafruit_DotStar *statusPixelDotStar =
     new Adafruit_DotStar(STATUS_DOTSTAR_NUM, STATUS_DOTSTAR_PIN_DATA,
-                         STATUS_DOTSTAR_PIN_CLK, DOTSTAR_BRG);
+                         STATUS_DOTSTAR_PIN_CLK, DOTSTAR_BGR);
 #endif
 
 /****************************************************************************/
@@ -67,7 +67,8 @@ void initStatusLED() {
 #else
     statusPixelDotStar =
         new Adafruit_DotStar(STATUS_DOTSTAR_NUM, STATUS_DOTSTAR_PIN_DATA,
-                             STATUS_DOTSTAR_PIN_CLK, STATUS_DOTSTAR_COLOR_ORDER)
+                             STATUS_DOTSTAR_PIN_CLK,
+                             STATUS_DOTSTAR_DEFAULT_COLOR_ORDER)
 #endif
     statusPixelDotStar->begin();
     statusPixelDotStar->clear();
@@ -412,4 +413,4 @@ void statusLEDBlink(ws_led_status_t statusState) {
     delay(100);
     blinkNum--;
   }
-}
+}

src/components/statusLED/Wippersnapper_StatusLED.h

@@ -57,6 +57,7 @@ typedef enum ws_led_status_t {
 #define LED_ERROR RED             ///< Error state
 
 #define STATUS_PIXEL_BRIGHTNESS_DEFAULT 0.5 ///< Default status pixel brightness
+#define STATUS_DOTSTAR_DEFAULT_COLOR_ORDER DOTSTAR_BGR ///< FunHouse default
 
 // Status LED
 void initStatusLED();