diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp index 175d49ba9c..2eaeb5d903 100644 --- a/wled00/bus_manager.cpp +++ b/wled00/bus_manager.cpp @@ -351,19 +351,19 @@ void BusDigital::setColorOrder(uint8_t colorOrder) { // credit @willmmiles & @netmindz https://github.com/wled/WLED/pull/4056 std::vector BusDigital::getLEDTypes() { return { - {TYPE_WS2812_RGB, "D", PSTR("WS281x")}, - {TYPE_SK6812_RGBW, "D", PSTR("SK6812/WS2814 RGBW")}, + {TYPE_WS2812_RGB, "D", PSTR("RGB WS281x")}, + {TYPE_WS2811_400KHZ, "D", PSTR("RGB 400kHz")}, + {TYPE_SK6812_RGBW, "D", PSTR("RGBW SK6812/WS2814")}, + {TYPE_UCS8904, "D", PSTR("RGBW UCS8904")}, + {TYPE_FW1906, "D", PSTR("RGBCCT FW1906/WS2811")}, + {TYPE_WS2805, "D", PSTR("RGBCCT WS2805")}, + {TYPE_SM16825, "D", PSTR("RGBCCT SM16825")}, + {TYPE_WS2812_1CH_X3, "D", PSTR("WS2811 White")}, {TYPE_TM1814, "D", PSTR("TM1814")}, - {TYPE_WS2811_400KHZ, "D", PSTR("400kHz")}, {TYPE_TM1829, "D", PSTR("TM1829")}, {TYPE_UCS8903, "D", PSTR("UCS8903")}, {TYPE_APA106, "D", PSTR("APA106/PL9823")}, {TYPE_TM1914, "D", PSTR("TM1914")}, - {TYPE_FW1906, "D", PSTR("FW1906 GRBCW")}, - {TYPE_UCS8904, "D", PSTR("UCS8904 RGBW")}, - {TYPE_WS2805, "D", PSTR("WS2805 RGBCW")}, - {TYPE_SM16825, "D", PSTR("SM16825 RGBCW")}, - {TYPE_WS2812_1CH_X3, "D", PSTR("WS2811 White")}, //{TYPE_WS2812_2CH_X3, "D", PSTR("WS281x CCT")}, // not implemented {TYPE_WS2812_WWA, "D", PSTR("WS281x WWA")}, // amber ignored {TYPE_WS2801, "2P", PSTR("WS2801")}, diff --git a/wled00/bus_wrapper.h b/wled00/bus_wrapper.h index 0ecd4f986d..19f25def7c 100644 --- a/wled00/bus_wrapper.h +++ b/wled00/bus_wrapper.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #ifndef BusWrapper_h #define BusWrapper_h @@ -50,7 +50,7 @@ #define I_8266_U1_UCS_4 26 #define I_8266_DM_UCS_4 27 #define I_8266_BB_UCS_4 28 -//FW1906 GRBCW +//FW1906 GRBCCT #define I_8266_U0_FW6_5 29 #define I_8266_U1_FW6_5 30 #define I_8266_DM_FW6_5 31 @@ -60,7 +60,7 @@ #define I_8266_U1_APA106_3 34 #define I_8266_DM_APA106_3 35 #define I_8266_BB_APA106_3 36 -//WS2805 (RGBCW) +//WS2805 (RGBCCT) #define I_8266_U0_2805_5 37 #define I_8266_U1_2805_5 38 #define I_8266_DM_2805_5 39 @@ -70,7 +70,7 @@ #define I_8266_U1_TM1914_3 42 #define I_8266_DM_TM1914_3 43 #define I_8266_BB_TM1914_3 44 -//SM16825 (RGBCW) +//SM16825 (RGBCCT) #define I_8266_U0_SM16825_5 45 #define I_8266_U1_SM16825_5 46 #define I_8266_DM_SM16825_5 47 @@ -98,19 +98,19 @@ //UCS8904 (RGBW) #define I_32_RN_UCS_4 25 #define I_32_I2_UCS_4 26 -//FW1906 GRBCW +//FW1906 GRBCCT 6 color channels #define I_32_RN_FW6_5 29 #define I_32_I2_FW6_5 30 //APA106 #define I_32_RN_APA106_3 33 #define I_32_I2_APA106_3 34 -//WS2805 (RGBCW) +//WS2805 (RGBCCT) #define I_32_RN_2805_5 37 #define I_32_I2_2805_5 38 //TM1914 (RGB) #define I_32_RN_TM1914_3 41 #define I_32_I2_TM1914_3 42 -//SM16825 (RGBCW) +//SM16825 (RGBCCT) #define I_32_RN_SM16825_5 45 #define I_32_I2_SM16825_5 46 @@ -180,12 +180,12 @@ #define B_8266_U1_APA106_3 NeoPixelBus //3 chan, esp8266, gpio2 #define B_8266_DM_APA106_3 NeoPixelBus //3 chan, esp8266, gpio3 #define B_8266_BB_APA106_3 NeoPixelBus //3 chan, esp8266, bb (any pin but 16) -//FW1906 GRBCW +//FW1906 GRBCCT #define B_8266_U0_FW6_5 NeoPixelBus //esp8266, gpio1 #define B_8266_U1_FW6_5 NeoPixelBus //esp8266, gpio2 #define B_8266_DM_FW6_5 NeoPixelBus //esp8266, gpio3 #define B_8266_BB_FW6_5 NeoPixelBus //esp8266, bb -//WS2805 GRBCW +//WS2805 GRBCCT #define B_8266_U0_2805_5 NeoPixelBus //esp8266, gpio1 #define B_8266_U1_2805_5 NeoPixelBus //esp8266, gpio2 #define B_8266_DM_2805_5 NeoPixelBus //esp8266, gpio3 @@ -195,7 +195,7 @@ #define B_8266_U1_TM1914_3 NeoPixelBus #define B_8266_DM_TM1914_3 NeoPixelBus #define B_8266_BB_TM1914_3 NeoPixelBus -//Sm16825 (RGBWC) +//Sm16825 (RGBCCT) #define B_8266_U0_SM16825_5 NeoPixelBus #define B_8266_U1_SM16825_5 NeoPixelBus #define B_8266_DM_SM16825_5 NeoPixelBus @@ -285,11 +285,11 @@ #define B_32_RN_APA106_3 NeoPixelBus #define B_32_I2_APA106_3 NeoPixelBus #define B_32_IP_APA106_3 NeoPixelBus // parallel I2S -//FW1906 GRBCW +//FW1906 GRBCCT 6 color channels #define B_32_RN_FW6_5 NeoPixelBus #define B_32_I2_FW6_5 NeoPixelBus #define B_32_IP_FW6_5 NeoPixelBus // parallel I2S -//WS2805 RGBWC +//WS2805 RGBCCT #define B_32_RN_2805_5 NeoPixelBus #define B_32_I2_2805_5 NeoPixelBus #define B_32_IP_2805_5 NeoPixelBus // parallel I2S @@ -297,7 +297,7 @@ #define B_32_RN_TM1914_3 NeoPixelBus #define B_32_I2_TM1914_3 NeoPixelBus #define B_32_IP_TM1914_3 NeoPixelBus // parallel I2S -//Sm16825 (RGBWC) +//Sm16825 (RGBCCT) #define B_32_RN_SM16825_5 NeoPixelBus #define B_32_I2_SM16825_5 NeoPixelBus #define B_32_IP_SM16825_5 NeoPixelBus // parallel I2S