jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 20:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

v5.7.1i - Add blink to WS2812 and Sonoff Leds

Browse Source 
5.7.1i
* Add blink to WS2812 and Sonoff Led (#643)
This commit is contained in:
arendst 2017-09-16 18:19:15 +02:00
parent a0dcdb59b2
commit 87e89cda56
4 changed files with 15 additions and 15 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.7.1h** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. Current version is **5.7.1i** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
### ATTENTION All versions ### ATTENTION All versions

5
sonoff/_releasenotes.ino
View File

@ -1,4 +1,7 @@
/* 5.7.1h /* 5.7.1i
* Add blink to WS2812 and Sonoff Led (#643)
*
* 5.7.1h
* Consolidate WS2812 (xdrv_ws2812) into Sonoff Led (xdrv_snfled) * Consolidate WS2812 (xdrv_ws2812) into Sonoff Led (xdrv_snfled)
* Invert WS2812 fade speed to align with Sonoff led (Speed 1 = fast, Speed 8 = slow) * Invert WS2812 fade speed to align with Sonoff led (Speed 1 = fast, Speed 8 = slow)
* Remove upper case MQTT receive buffer * Remove upper case MQTT receive buffer

3
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 0x05070108 // 5.7.1h #define VERSION 0x05070109 // 5.7.1i
enum log_t {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL}; enum log_t {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL};
enum week_t {Last, First, Second, Third, Fourth}; enum week_t {Last, First, Second, Third, Fourth};
@ -419,7 +419,6 @@ void setRelay(uint8_t rpower)
Serial.flush(); Serial.flush();
} }
else if (sfl_flg) { else if (sfl_flg) {
// sl_setPower(rpower &1);
sl_setPower(rpower); sl_setPower(rpower);
} }
else if (EXS_RELAY == sysCfg.module) { else if (EXS_RELAY == sysCfg.module) {

20
sonoff/xdrv_snfled.ino
View File

@ -63,6 +63,7 @@ uint8_t sl_dcolor[5];
uint8_t sl_tcolor[5]; uint8_t sl_tcolor[5];
uint8_t sl_lcolor[5]; uint8_t sl_lcolor[5];
uint8_t sl_power = 0;
uint8_t sl_any = 0; uint8_t sl_any = 0;
uint8_t sl_wakeupActive = 0; uint8_t sl_wakeupActive = 0;
uint8_t sl_wakeupDimmer = 0; uint8_t sl_wakeupDimmer = 0;
@ -481,6 +482,7 @@ void sl_init(void)
sysCfg.led_scheme = 0; sysCfg.led_scheme = 0;
} }
sl_power = 0;
sl_any = 0; sl_any = 0;
sl_wakeupActive = 0; sl_wakeupActive = 0;
} }
@ -568,20 +570,15 @@ char* sl_getColor(char* scolor)
return scolor; return scolor;
} }
boolean sl_power()
{
return ((power & (0x01 << (Maxdevice -1))) != 0);
}
void sl_prepPower() void sl_prepPower()
{ {
char scolor[11]; char scolor[11];
// do_cmnd_power(index, (sysCfg.led_dimmer[0]>0)); // do_cmnd_power(index, (sysCfg.led_dimmer[0]>0));
if (sysCfg.led_dimmer[0] && !(sl_power())) { if (sysCfg.led_dimmer[0] && !(sl_power)) {
do_cmnd_power(Maxdevice, 7); // No publishPowerState do_cmnd_power(Maxdevice, 7); // No publishPowerState
} }
else if (!sysCfg.led_dimmer[0] && sl_power()) { else if (!sysCfg.led_dimmer[0] && sl_power) {
do_cmnd_power(Maxdevice, 6); // No publishPowerState do_cmnd_power(Maxdevice, 6); // No publishPowerState
} }
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
@ -590,15 +587,16 @@ void sl_prepPower()
#endif // USE_DOMOTICZ #endif // USE_DOMOTICZ
if (sfl_flg > 1) { if (sfl_flg > 1) {
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_RSLT_POWER "\":\"%s\", \"" D_CMND_DIMMER "\":%d, \"" D_CMND_COLOR "\":\"%s\"}"), snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_RSLT_POWER "\":\"%s\", \"" D_CMND_DIMMER "\":%d, \"" D_CMND_COLOR "\":\"%s\"}"),
getStateText(sl_power()), sysCfg.led_dimmer[0], sl_getColor(scolor)); getStateText(sl_power), sysCfg.led_dimmer[0], sl_getColor(scolor));
} else { } else {
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_RSLT_POWER "\":\"%s\", \"" D_CMND_DIMMER "\":%d}"), snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_RSLT_POWER "\":\"%s\", \"" D_CMND_DIMMER "\":%d}"),
getStateText(sl_power()), sysCfg.led_dimmer[0]); getStateText(sl_power), sysCfg.led_dimmer[0]);
} }
} }
void sl_setPower(uint8_t mpower) void sl_setPower(uint8_t mpower)
{ {
sl_power = ((mpower & (0x01 << (Maxdevice -1))) != 0);
if (sl_wakeupActive) { if (sl_wakeupActive) {
sl_wakeupActive--; sl_wakeupActive--;
} }
@ -612,7 +610,7 @@ void sl_animate()
uint8_t cur_col[5]; uint8_t cur_col[5];
stripTimerCntr++; stripTimerCntr++;
if (!sl_power()) { // Power Off if (!sl_power) { // Power Off
sleep = sysCfg.sleep; sleep = sysCfg.sleep;
stripTimerCntr = 0; stripTimerCntr = 0;
for (byte i = 0; i < sfl_flg; i++) { for (byte i = 0; i < sfl_flg; i++) {
@ -686,7 +684,7 @@ void sl_animate()
} }
} }
if ((sysCfg.led_scheme < 2) || !sl_power()) { if ((sysCfg.led_scheme < 2) || !sl_power) {
for (byte i = 0; i < sfl_flg; i++) { for (byte i = 0; i < sfl_flg; i++) {
if (sl_lcolor[i] != sl_tcolor[i]) { if (sl_lcolor[i] != sl_tcolor[i]) {
sl_any = 1; sl_any = 1;