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

Color handling for Sonoff L1

This commit is contained in:
reef-actor 2019-04-10 13:54:50 +01:00 committed by reef-actor
parent 98864116c1
commit d95d18d84e
2 changed files with 173 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sonoff/sonoff_template.h
View File

@ -341,6 +341,7 @@ enum SupportedModules {
ARMTRONIX_DIMMERS,
SK03_TUYA,
PS_16_DZ,
SONOFF_L1,
TECKIN_US,
MANZOKU_EU_4,
OBI2,
@ -352,7 +353,7 @@ enum SupportedModules {
SP10,
WAGA,
SYF05,
MAXMODULE };
MAXMODULE};
#define USER_MODULE 255
@ -698,6 +699,7 @@ const uint8_t kModuleNiceList[] PROGMEM = {
#endif
#ifdef USE_PS_16_DZ
PS_16_DZ,
SONOFF_L1,
#endif
H801, // Light Devices
MAGICHOME,
@ -1768,6 +1770,26 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
GPIO_USER,
0
},
{ "SONOFF L1", // Sonoff L1 RGB LED controller (ESP8266 w/ separate Nuvoton MCU)
GPIO_USER,
GPIO_TXD, // GPIO01 MCU serial control
GPIO_USER,
GPIO_RXD, // GPIO03 MCU serial control
GPIO_USER,
GPIO_USER,
// GPIO06 (SD_CLK Flash)
// GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT)
// GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT)
0, // GPIO09 (SD_DATA2 Flash QIO or ESP8285)
0, // GPIO10 (SD_DATA3 Flash QIO or ESP8285)
// GPIO11 (SD_CMD Flash)
GPIO_USER,
GPIO_LED1, // GPIO13 WiFi LED - Link and Power status
GPIO_USER,
GPIO_USER,
GPIO_USER,
0
},
{ "Teckin US", // Teckin SP20 US with Energy Monitoring
// https://www.amazon.com/Outlet-Compatible-Monitoring-Function-Required/dp/B079Q5W22B
// https://www.amazon.com/Outlet-ZOOZEE-Monitoring-Function-Compatible/dp/B07J2LR5KN

169
sonoff/xdrv_19_ps16dz_dimmer.ino
View File

@ -22,20 +22,32 @@
#define XDRV_19 19
#define PS16DZ_BUFFER_SIZE 80
#define PS16DZ_BUFFER_SIZE 140
#define PS16DZ_TYPE_ACK 0
#define PS16DZ_TYPE_PWR 1
#define PS16DZ_TYPE_DIM 2
#define PS16DZ_SONOFF_L1_MODE_COLORFUL 1 // Colorful (static color)
#define PS16DZ_SONOFF_L1_MODE_COLORFUL_GRADIENT 2 // Colorful Gradient
#define PS16DZ_SONOFF_L1_MODE_COLORFUL_BREATH 3 // Colorful Breath
#define PS16DZ_SONOFF_L1_MODE_DIY_GRADIENT 4 // DIY Gradient (fade in and out) [Speed 1- 100, color]
#define PS16DZ_SONOFF_L1_MODE_DIY_PULSE 5 // DIY Pulse (faster fade in and out) [Speed 1- 100, color]
#define PS16DZ_SONOFF_L1_MODE_DIY_BREATH 6 // DIY Breath (toggle on/off) [Speed 1- 100, color]
#define PS16DZ_SONOFF_L1_MODE_DIY_STROBE 7 // DIY Strobe (faster toggle on/off) [Speed 1- 100, color]
#define PS16DZ_SONOFF_L1_MODE_RGB_GRADIENT 8 // RGB Gradient
#define PS16DZ_SONOFF_L1_MODE_RGB_PULSE 9 // RGB Pulse
#define PS16DZ_SONOFF_L1_MODE_RGB_BREATH 10 // RGB Breath
#define PS16DZ_SONOFF_L1_MODE_RGB_STROBE 11 // RGB strobe
#define PS16DZ_SONOFF_L1_MODE_SYNC_TO_MUSIC 12 // Sync to music [Speed 1- 100, sensitivity 1 - 10]
#include <TasmotaSerial.h>
TasmotaSerial *PS16DZSerial = nullptr;
bool ps16dz_ignore_dim = false; // Flag to skip serial send to prevent looping when processing inbound states from the faceplate interaction
//uint64_t ps16dz_seq = 0;
uint8_t color_channel_values[3]; // Most recent serial sent/received values
char *ps16dz_tx_buffer = nullptr; // Serial transmit buffer
char *ps16dz_rx_buffer = nullptr; // Serial receive buffer
int ps16dz_byte_counter = 0;
@ -93,13 +105,42 @@ bool PS16DZSetPower(void)
bool PS16DZSetChannels(void)
{
PS16DZSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
if(PS16DZSerial) {
switch (light_subtype) {
case LST_SINGLE:
// PS16DZSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
break;
case LST_RGB:
P16DZSetChannelsIfRequired();
break;
}
}
return true;
}
void P16DZSetChannelsIfRequired()
{
bool is_color_change = memcmp(XdrvMailbox.data, color_channel_values, 3) != 0;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: channels were: R:%d, G:%d, B:%d"),
color_channel_values[0],
color_channel_values[1],
color_channel_values[2]);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: channels received: R:%d, G:%d, B:%d, changed:%d"),
((uint8_t*)XdrvMailbox.data)[0],
((uint8_t*)XdrvMailbox.data)[1],
((uint8_t*)XdrvMailbox.data)[2],
is_color_change);
if(!is_color_change) return;
PS16DZSerialRGB(((uint8_t*)XdrvMailbox.data)[0], ((uint8_t*)XdrvMailbox.data)[1], ((uint8_t*)XdrvMailbox.data)[2]);
}
void PS16DZSerialDuty(uint8_t duty)
{
if (duty > 0 && !ps16dz_ignore_dim && PS16DZSerial) {
if (duty > 0 && !ps16dz_ignore_dim) {
if (duty < 25) {
duty = 25; // dimming acts odd below 25(10%) - this mirrors the threshold set on the faceplate itself
}
@ -110,10 +151,30 @@ void PS16DZSerialDuty(uint8_t duty)
ps16dz_ignore_dim = false; // reset flag
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send Dim Level skipped due to 0 or already set. Value=%d"), duty);
}
}
void PS16DZSerialRGB(uint8_t red, uint8_t green, uint8_t blue)
{
// Write out static color update eg.
// AT+UPDATE="sequence":"1554682835320","mode":1,"colorR":255,"colorB":101,"colorG":46,"light_types":1
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "AT+UPDATE=\"sequence\":\""));
printTimestamp();
int light_types_value = 1;
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s\",\"mode\":%d"), ps16dz_tx_buffer, PS16DZ_SONOFF_L1_MODE_COLORFUL);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"colorR\":%d"), ps16dz_tx_buffer, red);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"colorG\":%d"), ps16dz_tx_buffer, green);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"colorB\":%d"), ps16dz_tx_buffer, blue);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"light_types\":%d"), ps16dz_tx_buffer, light_types_value);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send serial command: %s"), ps16dz_tx_buffer );
PS16DZSerial->print(ps16dz_tx_buffer);
PS16DZSerial->write(0x1B);
PS16DZSerial->flush();
}
void PS16DZResetWifi(void)
{
if (!Settings.flag.button_restrict) {
@ -129,7 +190,17 @@ void PS16DZResetWifi(void)
bool PS16DZModuleSelected(void)
{
light_type = LT_SERIAL1;
switch (my_module_type)
{
case PS_16_DZ:
light_type = LT_SERIAL1;
break;
case SONOFF_L1:
light_type = LT_PWM3;
break;
}
return true;
}
@ -165,33 +236,88 @@ void PS16DZSerialInput(void)
else {
ps16dz_rx_buffer[ps16dz_byte_counter++] = 0x00;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: command received: %s"), ps16dz_rx_buffer);
if(!strncmp(ps16dz_rx_buffer+3, "UPDATE", 6) || !strncmp(ps16dz_rx_buffer+3, "RESULT", 6)) {
if(!strncmp(ps16dz_rx_buffer+3, "UPDATE", 6)) {
char *end_str;
char *string = ps16dz_rx_buffer+10;
char* token = strtok_r(string, ",", &end_str);
char color_channel_name;
bool color_channel_updated[3] = { false, false, false };
memcpy(color_channel_values, Settings.light_color, 3);
bool is_color_change = false;
while (token != nullptr) {
char* end_token;
char* token2 = strtok_r(token, ":", &end_token);
char* token3 = strtok_r(nullptr, ":", &end_token);
if(!strncmp(token2, "\"switch\"", 8)){
bool ps16dz_power = !strncmp(token3, "\"on\"", 4)?true:false;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: power received: %s"), token3);
if((power || Settings.light_dimmer > 0) && (power !=ps16dz_power)) {
ExecuteCommandPower(1, ps16dz_power, SRC_SWITCH); // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
// if((power || Settings.light_dimmer > 0) && (power !=ps16dz_power)) {
// ExecuteCommandPower(1, ps16dz_power, SRC_SWITCH); // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
// }
}
else if(sscanf(token2, "\"color%c\"", &color_channel_name)==1){
int color_channel_index;
switch(color_channel_name)
{
case 'R':
color_channel_index = 0;
break;
case 'G':
color_channel_index = 1;
break;
case 'B':
color_channel_index = 2;
break;
}
int color_channel_value = atoi(token3);
color_channel_values[color_channel_index] = color_channel_value;
color_channel_updated[color_channel_index] = true;
bool all_color_channels_updated =
color_channel_updated[0] &&
color_channel_updated[1] &&
color_channel_updated[2];
if(all_color_channels_updated)
{
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: color received: R:%d, G:%d, B:%d"),
color_channel_values[0],
color_channel_values[1],
color_channel_values[2]);
}
is_color_change = memcmp(color_channel_values, Settings.light_color, 3) != 0;
if(power && all_color_channels_updated && is_color_change)
{
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_COLOR " %02x%02x%02x"),
color_channel_values[0],
color_channel_values[1],
color_channel_values[2]);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send CMND_COLOR_STR=%s"), scmnd );
ExecuteCommand(scmnd, SRC_SWITCH);
}
}
else if(!strncmp(token2, "\"bright\"", 8)){
uint8_t ps16dz_bright = atoi(token3);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: brightness received: %d"), ps16dz_bright);
if(power && ps16dz_bright > 0 && ps16dz_bright != Settings.light_dimmer) {
// if(power && ps16dz_bright > 0 && ps16dz_bright != Settings.light_dimmer) {
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), ps16dz_bright );
// snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), ps16dz_bright );
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send CMND_DIMMER_STR=%s"), scmnd );
// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send CMND_DIMMER_STR=%s"), scmnd );
ps16dz_ignore_dim = true;
ExecuteCommand(scmnd, SRC_SWITCH);
}
// ps16dz_ignore_dim = true;
// ExecuteCommand(scmnd, SRC_SWITCH);
// }
}
else if(!strncmp(token2, "\"sequence\"", 10)){
//ps16dz_seq = strtoull(token3+1, nullptr, 10);
@ -199,6 +325,12 @@ void PS16DZSerialInput(void)
}
token = strtok_r(nullptr, ",", &end_str);
}
if(!is_color_change)
{
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Update received"));
PS16DZSendCommand(PS16DZ_TYPE_ACK);
}
}
else if(!strncmp(ps16dz_rx_buffer+3, "SETTING", 7)) {
AddLog_P(LOG_LEVEL_DEBUG, PSTR("PSZ: Reset"));
@ -206,8 +338,6 @@ void PS16DZSerialInput(void)
}
memset(ps16dz_rx_buffer, 0, PS16DZ_BUFFER_SIZE);
ps16dz_byte_counter = 0;
PS16DZSendCommand();
}
}
}
@ -222,7 +352,8 @@ bool Xdrv19(uint8_t function)
{
bool result = false;
if (PS_16_DZ == my_module_type) {
if (PS_16_DZ == my_module_type ||
SONOFF_L1 == my_module_type) {
switch (function) {
case FUNC_LOOP:
if (PS16DZSerial) { PS16DZSerialInput(); }