mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v5.9.1c - Add support for WS2812 RGBW 

5.9.1c
 * Add support for WS2812 RGBW ledstrips to be enabled in
user_config.h with define USE_WS2812_CTYPE (#1156)
This commit is contained in:
arendst 2017-11-11 16:02:18 +01:00
parent e27192e48d
commit 39d30328e4
6 changed files with 80 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
## Sonoff-Tasmota ## Sonoff-Tasmota
Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
Current version is **5.9.1b** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. Current version is **5.9.1c** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
### ATTENTION All versions ### ATTENTION All versions

7
sonoff/_releasenotes.ino
View File

@ -1,6 +1,9 @@
/* 5.9.1b /* 5.9.1c
* Add support for WS2812 RGBW ledstrips to be enabled in user_config.h with define USE_WS2812_CTYPE (#1156)
*
* 5.9.1b
* Remove spaces in JSON messages * Remove spaces in JSON messages
* Add support for INA219 Voltage and Current sensor to be enabled in user_config.h * Add support for INA219 Voltage and Current sensor to be enabled in user_config.h with define USE_INA219
* *
* 5.9.1a * 5.9.1a
* Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146) * Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146)

2
sonoff/sonoff.ino
View File

@ -25,7 +25,7 @@
- Select IDE Tools - Flash Size: "1M (no SPIFFS)" - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
====================================================*/ ====================================================*/
#define VERSION 0x05090102 // 5.9.1b #define VERSION 0x05090103 // 5.9.1c
// Location specific includes // Location specific includes
#include "sonoff.h" // Enumaration used in user_config.h #include "sonoff.h" // Enumaration used in user_config.h

2
sonoff/user_config.h
View File

@ -179,7 +179,7 @@
#define USE_IR_RECEIVE // Support for IR receiver (+4k code) #define USE_IR_RECEIVE // Support for IR receiver (+4k code)
#define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem) - Disable by // #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem) - Disable by //
#define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB) #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW)
// #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow
/*********************************************************************************************\ /*********************************************************************************************\

12
sonoff/xdrv_snfled.ino
View File

@ -29,7 +29,7 @@
* 5 PWM5 RGBCW yes (H801, Arilux) * 5 PWM5 RGBCW yes (H801, Arilux)
* 9 reserved no * 9 reserved no
* 10 reserved yes * 10 reserved yes
* 11 +WS2812 RGB no * 11 +WS2812 RGB(W) no (One WS2812 RGB or RGBW ledstrip)
* 12 AiLight RGBW no * 12 AiLight RGBW no
* 13 Sonoff B1 RGBCW yes * 13 Sonoff B1 RGBCW yes
* *
@ -174,6 +174,8 @@ void LightInit(void)
{ {
uint8_t max_scheme = LS_MAX -1; uint8_t max_scheme = LS_MAX -1;
light_subtype = light_type &7;
if (light_type < LT_PWM6) { // PWM if (light_type < LT_PWM6) { // PWM
for (byte i = 0; i < light_type; i++) { for (byte i = 0; i < light_type; i++) {
Settings.pwm_value[i] = 0; // Disable direct PWM control Settings.pwm_value[i] = 0; // Disable direct PWM control
@ -198,6 +200,9 @@ void LightInit(void)
} }
#ifdef USE_WS2812 // ************************************************************************ #ifdef USE_WS2812 // ************************************************************************
else if (LT_WS2812 == light_type) { else if (LT_WS2812 == light_type) {
#if (USE_WS2812_CTYPE > 1)
light_subtype++; // from RGB to RGBW
#endif
Ws2812Init(); Ws2812Init();
max_scheme = LS_MAX +7; max_scheme = LS_MAX +7;
} }
@ -214,7 +219,6 @@ void LightInit(void)
LightMy92x1Init(); LightMy92x1Init();
} }
light_subtype = light_type &7;
if (light_subtype < LST_RGB) { if (light_subtype < LST_RGB) {
max_scheme = LS_POWER; max_scheme = LS_POWER;
} }
@ -539,7 +543,7 @@ void LightAnimate()
} }
#ifdef USE_WS2812 // ************************************************************************ #ifdef USE_WS2812 // ************************************************************************
if (LT_WS2812 == light_type) { if (LT_WS2812 == light_type) {
Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2]); Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2], cur_col[3]);
} }
#endif // USE_ES2812 ************************************************************************ #endif // USE_ES2812 ************************************************************************
if (light_type > LT_WS2812) { if (light_type > LT_WS2812) {
@ -800,7 +804,7 @@ boolean LightCommand(char *type, uint16_t index, char *dataBuf, uint16_t data_le
else if ((CMND_LED == command_code) && (LT_WS2812 == light_type) && (index > 0) && (index <= Settings.light_pixels)) { else if ((CMND_LED == command_code) && (LT_WS2812 == light_type) && (index > 0) && (index <= Settings.light_pixels)) {
if (data_len > 0) { if (data_len > 0) {
if (LightColorEntry(dataBuf, data_len)) { if (LightColorEntry(dataBuf, data_len)) {
Ws2812SetColor(index, light_entry_color[0], light_entry_color[1], light_entry_color[2]); Ws2812SetColor(index, light_entry_color[0], light_entry_color[1], light_entry_color[2], light_entry_color[3]);
} }
} }
snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Ws2812GetColor(index, scolor)); snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Ws2812GetColor(index, scolor));

78
sonoff/xdrv_ws2812.ino
View File

@ -19,7 +19,7 @@
#ifdef USE_WS2812 #ifdef USE_WS2812
/*********************************************************************************************\ /*********************************************************************************************\
* WS2812 Leds using NeopixelBus library * WS2812 RGB / RGBW Leds using NeopixelBus library
\*********************************************************************************************/ \*********************************************************************************************/
#include <NeoPixelBus.h> #include <NeoPixelBus.h>
@ -27,13 +27,21 @@
#ifdef USE_WS2812_DMA #ifdef USE_WS2812_DMA
#if (USE_WS2812_CTYPE == 1) #if (USE_WS2812_CTYPE == 1)
NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod> *strip = NULL; NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod> *strip = NULL;
#else // USE_WS2812_CTYPE #elif (USE_WS2812_CTYPE == 2)
NeoPixelBus<NeoRgbwFeature, Neo800KbpsMethod> *strip = NULL;
#elif (USE_WS2812_CTYPE == 3)
NeoPixelBus<NeoGrbwFeature, Neo800KbpsMethod> *strip = NULL;
#else // USE_WS2812_CTYPE
NeoPixelBus<NeoRgbFeature, Neo800KbpsMethod> *strip = NULL; NeoPixelBus<NeoRgbFeature, Neo800KbpsMethod> *strip = NULL;
#endif // USE_WS2812_CTYPE #endif // USE_WS2812_CTYPE
#else // USE_WS2812_DMA #else // USE_WS2812_DMA
#if (USE_WS2812_CTYPE == 1) #if (USE_WS2812_CTYPE == 1)
NeoPixelBus<NeoGrbFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL; NeoPixelBus<NeoGrbFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL;
#else // USE_WS2812_CTYPE #elif (USE_WS2812_CTYPE == 2)
NeoPixelBus<NeoRgbwFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL;
#elif (USE_WS2812_CTYPE == 3)
NeoPixelBus<NeoGrbwFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL;
#else // USE_WS2812_CTYPE
NeoPixelBus<NeoRgbFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL; NeoPixelBus<NeoRgbFeature, NeoEsp8266BitBang800KbpsMethod> *strip = NULL;
#endif // USE_WS2812_CTYPE #endif // USE_WS2812_CTYPE
#endif // USE_WS2812_DMA #endif // USE_WS2812_DMA
@ -82,12 +90,22 @@ uint8_t ws_show_next = 1;
void Ws2812StripShow() void Ws2812StripShow()
{ {
#if (USE_WS2812_CTYPE > 1)
RgbwColor c;
#else
RgbColor c; RgbColor c;
#endif
if (Settings.light_correction) { if (Settings.light_correction) {
for (uint16_t i = 0; i < Settings.light_pixels; i++) { for (uint16_t i = 0; i < Settings.light_pixels; i++) {
c = strip->GetPixelColor(i); c = strip->GetPixelColor(i);
strip->SetPixelColor(i, RgbColor(ledTable[c.R], ledTable[c.G], ledTable[c.B])); c.R = ledTable[c.R];
c.G = ledTable[c.G];
c.B = ledTable[c.B];
#if (USE_WS2812_CTYPE > 1)
c.W = ledTable[c.W];
#endif
strip->SetPixelColor(i, c);
} }
} }
strip->Show(); strip->Show();
@ -104,18 +122,22 @@ int mod(int a, int b)
#define cmin(a,b) ((a)<(b)?(a):(b)) #define cmin(a,b) ((a)<(b)?(a):(b))
void Ws2812UpdatePixelColor(int position, struct RgbColor hand_color, uint8_t hand) void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, uint8_t hand)
{ {
#if (USE_WS2812_CTYPE > 1)
RgbwColor color;
#else
RgbColor color; RgbColor color;
#endif
uint16_t mod_position = mod(position, (int)Settings.light_pixels); uint16_t mod_position = mod(position, (int)Settings.light_pixels);
color = strip->GetPixelColor(mod_position); color = strip->GetPixelColor(mod_position);
float dimmer = 100 / (float)Settings.light_dimmer; float dimmer = 100 / (float)Settings.light_dimmer;
uint8_t offset = 1 << hand; uint8_t offset = 1 << hand;
color.R = cmin(color.R + ((hand_color.R / dimmer) / offset), 255); color.R = cmin(color.R + ((hand_color.red / dimmer) / offset), 255);
color.G = cmin(color.G + ((hand_color.G / dimmer) / offset), 255); color.G = cmin(color.G + ((hand_color.green / dimmer) / offset), 255);
color.B = cmin(color.B + ((hand_color.B / dimmer) / offset), 255); color.B = cmin(color.B + ((hand_color.blue / dimmer) / offset), 255);
strip->SetPixelColor(mod_position, color); strip->SetPixelColor(mod_position, color);
} }
@ -124,7 +146,7 @@ void Ws2812UpdateHand(int position, uint8_t index)
if (Settings.flag.ws_clock_reverse) { if (Settings.flag.ws_clock_reverse) {
position = Settings.light_pixels -position; position = Settings.light_pixels -position;
} }
RgbColor hand_color = RgbColor(Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE]); WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] };
Ws2812UpdatePixelColor(position, hand_color, 0); Ws2812UpdatePixelColor(position, hand_color, 0);
for (uint8_t h = 1; h <= ((Settings.ws_width[index] -1) / 2); h++) { for (uint8_t h = 1; h <= ((Settings.ws_width[index] -1) / 2); h++) {
@ -139,7 +161,6 @@ void Ws2812Clock()
int clksize = 600 / (int)Settings.light_pixels; int clksize = 600 / (int)Settings.light_pixels;
Ws2812UpdateHand((RtcTime.second * 10) / clksize, WS_SECOND); Ws2812UpdateHand((RtcTime.second * 10) / clksize, WS_SECOND);
Ws2812UpdateHand((RtcTime.minute * 10) / clksize, WS_MINUTE); Ws2812UpdateHand((RtcTime.minute * 10) / clksize, WS_MINUTE);
// Ws2812UpdateHand((RtcTime.hour % 12) * (50 / clksize), WS_HOUR);
Ws2812UpdateHand(((RtcTime.hour % 12) * (50 / clksize)) + ((RtcTime.minute * 10) / (12 * clksize)), WS_HOUR); Ws2812UpdateHand(((RtcTime.hour % 12) * (50 / clksize)) + ((RtcTime.minute * 10) / (12 * clksize)), WS_HOUR);
Ws2812StripShow(); Ws2812StripShow();
@ -177,7 +198,12 @@ void Ws2812Gradient(uint8_t schemenr)
* Display a gradient of colors for the current color scheme. * Display a gradient of colors for the current color scheme.
* Repeat is the number of repetitions of the gradient (pick a multiple of 2 for smooth looping of the gradient). * Repeat is the number of repetitions of the gradient (pick a multiple of 2 for smooth looping of the gradient).
*/ */
#if (USE_WS2812_CTYPE > 1)
RgbwColor c;
c.W = 0;
#else
RgbColor c; RgbColor c;
#endif
ColorScheme scheme = kSchemes[schemenr]; ColorScheme scheme = kSchemes[schemenr];
if (scheme.count < 2) { if (scheme.count < 2) {
@ -222,7 +248,12 @@ void Ws2812Bars(uint8_t schemenr)
* Display solid bars of color for the current color scheme. * Display solid bars of color for the current color scheme.
* Width is the width of each bar in pixels/lights. * Width is the width of each bar in pixels/lights.
*/ */
#if (USE_WS2812_CTYPE > 1)
RgbwColor c;
c.W = 0;
#else
RgbColor c; RgbColor c;
#endif
uint16_t i; uint16_t i;
ColorScheme scheme = kSchemes[schemenr]; ColorScheme scheme = kSchemes[schemenr];
@ -268,12 +299,20 @@ void Ws2812Init()
#ifdef USE_WS2812_DMA #ifdef USE_WS2812_DMA
#if (USE_WS2812_CTYPE == 1) #if (USE_WS2812_CTYPE == 1)
strip = new NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. strip = new NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
#elif (USE_WS2812_CTYPE == 2)
strip = new NeoPixelBus<NeoRgbwFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
#elif (USE_WS2812_CTYPE == 3)
strip = new NeoPixelBus<NeoGrbwFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
#else // USE_WS2812_CTYPE #else // USE_WS2812_CTYPE
strip = new NeoPixelBus<NeoRgbFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. strip = new NeoPixelBus<NeoRgbFeature, Neo800KbpsMethod>(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
#endif // USE_WS2812_CTYPE #endif // USE_WS2812_CTYPE
#else // USE_WS2812_DMA #else // USE_WS2812_DMA
#if (USE_WS2812_CTYPE == 1) #if (USE_WS2812_CTYPE == 1)
strip = new NeoPixelBus<NeoGrbFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]); strip = new NeoPixelBus<NeoGrbFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
#elif (USE_WS2812_CTYPE == 2)
strip = new NeoPixelBus<NeoRgbwFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
#elif (USE_WS2812_CTYPE == 3)
strip = new NeoPixelBus<NeoGrbwFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
#else // USE_WS2812_CTYPE #else // USE_WS2812_CTYPE
strip = new NeoPixelBus<NeoRgbFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]); strip = new NeoPixelBus<NeoRgbFeature, NeoEsp8266BitBang800KbpsMethod>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
#endif // USE_WS2812_CTYPE #endif // USE_WS2812_CTYPE
@ -289,9 +328,15 @@ void Ws2812Clear()
ws_show_next = 1; ws_show_next = 1;
} }
void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue) void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white)
{ {
#if (USE_WS2812_CTYPE > 1)
RgbwColor lcolor;
lcolor.W = white;
#else
RgbColor lcolor; RgbColor lcolor;
#endif
lcolor.R = red; lcolor.R = red;
lcolor.G = green; lcolor.G = green;
lcolor.B = blue; lcolor.B = blue;
@ -309,14 +354,19 @@ void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue)
char* Ws2812GetColor(uint16_t led, char* scolor) char* Ws2812GetColor(uint16_t led, char* scolor)
{ {
uint8_t sl_ledcolor[3]; uint8_t sl_ledcolor[4];
#if (USE_WS2812_CTYPE > 1)
RgbwColor lcolor = strip->GetPixelColor(led -1);
sl_ledcolor[3] = lcolor.W;
#else
RgbColor lcolor = strip->GetPixelColor(led -1); RgbColor lcolor = strip->GetPixelColor(led -1);
#endif
sl_ledcolor[0] = lcolor.R; sl_ledcolor[0] = lcolor.R;
sl_ledcolor[1] = lcolor.G; sl_ledcolor[1] = lcolor.G;
sl_ledcolor[2] = lcolor.B; sl_ledcolor[2] = lcolor.B;
scolor[0] = '\0'; scolor[0] = '\0';
for (byte i = 0; i < 3; i++) { for (byte i = 0; i < light_subtype; i++) {
if (Settings.flag.decimal_text) { if (Settings.flag.decimal_text) {
snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]); snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
} else { } else {