Skip to content

Commit ff20b12

Browse files
committed
change(esp32): Added neopixelWriteOrdered() function
1 parent fc43ac4 commit ff20b12

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include "esp32-hal-rgb-led.h"
44

55
void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {
6-
neopixelWriteOrdered(pin, GRB, red_val, green_val, blue_val);
6+
neopixelWriteOrdered(pin, LED_COLOR_ORDER_GRB, red_val, green_val, blue_val);
77
}
88

9-
void neopixelWriteOrdered(uint8_t pin, color_order_t color_order, uint8_t red_val, uint8_t green_val, uint8_t blue_val) {
9+
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) {
1010
#if SOC_RMT_SUPPORTED
1111
rmt_data_t led_data[24];
1212

@@ -20,28 +20,28 @@ void neopixelWriteOrdered(uint8_t pin, color_order_t color_order, uint8_t red_va
2020
}
2121

2222
int color[3];
23-
switch (color_order) {
24-
case RGB:
23+
switch (rgb_led_color_order) {
24+
case LED_COLOR_ORDER_RGB:
2525
color[0] = red_val;
2626
color[1] = green_val;
2727
color[2] = blue_val;
2828
break;
29-
case BGR:
29+
case LED_COLOR_ORDER_BGR:
3030
color[0] = blue_val;
3131
color[1] = green_val;
3232
color[2] = red_val;
3333
break;
34-
case BRG:
34+
case LED_COLOR_ORDER_BRG:
3535
color[0] = blue_val;
3636
color[1] = red_val;
3737
color[2] = green_val;
3838
break;
39-
case RBG:
39+
case LED_COLOR_ORDER_RBG:
4040
color[0] = red_val;
4141
color[1] = blue_val;
4242
color[2] = green_val;
4343
break;
44-
case GBR:
44+
case LED_COLOR_ORDER_GBR:
4545
color[0] = green_val;
4646
color[1] = blue_val;
4747
color[2] = red_val;

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ extern "C" {
1212
#endif
1313

1414
typedef enum {
15-
RGB,
16-
BGR,
17-
BRG,
18-
RBG,
19-
GBR,
20-
GRB
21-
} color_order_t;
15+
LED_COLOR_ORDER_RGB,
16+
LED_COLOR_ORDER_BGR,
17+
LED_COLOR_ORDER_BRG,
18+
LED_COLOR_ORDER_RBG,
19+
LED_COLOR_ORDER_GBR,
20+
LED_COLOR_ORDER_GRB
21+
} rgb_led_color_order_t;
2222

2323
void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
2424

25-
void neopixelWriteOrdered(uint8_t pin, color_order_t color_order, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
25+
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);
2626

2727
#ifdef __cplusplus
2828
}

0 commit comments

Comments
 (0)