change(esp32): Added the possibility to specify LED color order

Author: sblantipodi

cores/esp32/esp32-hal-rgb-led.c

@@ -3,10 +3,6 @@
 #include "esp32-hal-rgb-led.h"
 
 void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {
-  neopixelWriteOrdered(pin, LED_COLOR_ORDER_GRB, red_val, green_val, blue_val);
-}
-
-void neopixelWriteOrdered(uint8_t pin, rgb_led_color_order_t rgb_led_color_order, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {
 #if SOC_RMT_SUPPORTED
   rmt_data_t led_data[24];
 
@@ -19,39 +15,12 @@ void neopixelWriteOrdered(uint8_t pin, rgb_led_color_order_t rgb_led_color_order
     return;
   }
 
-  int color[3];
-  switch (rgb_led_color_order) {
-    case LED_COLOR_ORDER_RGB:
-      color[0] = red_val;
-      color[1] = green_val;
-      color[2] = blue_val;
-      break;
-    case LED_COLOR_ORDER_BGR:
-      color[0] = blue_val;
-      color[1] = green_val;
-      color[2] = red_val;
-      break;
-    case LED_COLOR_ORDER_BRG:
-      color[0] = blue_val;
-      color[1] = red_val;
-      color[2] = green_val;
-      break;
-    case LED_COLOR_ORDER_RBG:
-      color[0] = red_val;
-      color[1] = blue_val;
-      color[2] = green_val;
-      break;
-    case LED_COLOR_ORDER_GBR:
-      color[0] = green_val;
-      color[1] = blue_val;
-      color[2] = red_val;
-      break;
-    default:
-      color[0] = green_val;
-      color[1] = red_val;
-      color[2] = blue_val;
-      break;
-  }
+#ifdef RGB_BUILTIN_COLOR_ORDER_STRUCT
+  int color[] = RGB_BUILTIN_COLOR_ORDER_STRUCT;
+#else
+  // WS2812B color bit order is G, R, B
+  int color[] = {green_val, red_val, blue_val};
+#endif
   int i = 0;
   for (int col = 0; col < 3; col++) {
     for (int bit = 0; bit < 8; bit++) {

cores/esp32/esp32-hal-rgb-led.h

@@ -11,19 +11,8 @@ extern "C" {
 #define RGB_BRIGHTNESS 64
 #endif
 
-typedef enum {
-  LED_COLOR_ORDER_RGB,
-  LED_COLOR_ORDER_BGR,
-  LED_COLOR_ORDER_BRG,
-  LED_COLOR_ORDER_RBG,
-  LED_COLOR_ORDER_GBR,
-  LED_COLOR_ORDER_GRB
-} rgb_led_color_order_t;
-
 void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
 
-void neopixelWriteOrdered(uint8_t pin, rgb_led_color_order_t rgb_led_color_order, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
-
 #ifdef __cplusplus
 }
 #endif

variants/lolin_s3_mini/pins_arduino.h

@@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 47 + SOC_GPIO_PIN_COUNT;
 #define LED_BUILTIN    LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
+#define RGB_BUILTIN_COLOR_ORDER_STRUCT {red_val, green_val, blue_val}
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;