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

Merge pull request #6002 from reef-actor/sonoff-l1 

Sonoff L1
This commit is contained in:
Theo Arends 2019-07-02 10:30:36 +02:00 committed by GitHub
parent 998887fe30 f1efdb8905
commit 2425065a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 202 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sonoff/sonoff_template.h
View File

@ -352,6 +352,7 @@ enum SupportedModules {
SP10, SP10,
WAGA, WAGA,
SYF05, SYF05,
SONOFF_L1,
MAXMODULE}; MAXMODULE};
#define USER_MODULE 255 #define USER_MODULE 255
@ -698,6 +699,7 @@ const uint8_t kModuleNiceList[] PROGMEM = {
#endif #endif
#ifdef USE_PS_16_DZ #ifdef USE_PS_16_DZ
PS_16_DZ, PS_16_DZ,
SONOFF_L1,
#endif #endif
H801, // Light Devices H801, // Light Devices
MAGICHOME, MAGICHOME,
@ -1978,6 +1980,26 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
0, // GPIO15 wired to GND 0, // GPIO15 wired to GND
GPIO_USER, // GPIO16 N.C. GPIO_USER, // GPIO16 N.C.
ADC0_USER // ADC0 A0 Analog input ADC0_USER // ADC0 A0 Analog input
},
{ "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
} }
}; };

258
sonoff/xdrv_19_ps16dz_dimmer.ino
View File

@ -22,20 +22,29 @@
#define XDRV_19 19 #define XDRV_19 19
#define PS16DZ_BUFFER_SIZE 80 #define PS16DZ_BUFFER_SIZE 140
#define PS16DZ_TYPE_ACK 0 #define PS16DZ_SONOFF_L1_MODE_COLORFUL 1 // Colorful (static color)
#define PS16DZ_TYPE_PWR 1 #define PS16DZ_SONOFF_L1_MODE_COLORFUL_GRADIENT 2 // Colorful Gradient
#define PS16DZ_TYPE_DIM 2 #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> #include <TasmotaSerial.h>
TasmotaSerial *PS16DZSerial = nullptr; TasmotaSerial *PS16DZSerial = nullptr;
bool ps16dz_ignore_dim = false; // Flag to skip serial send to prevent looping when processing inbound states from the faceplate interaction bool ps16dz_supports_color = false;
bool ps16dz_switch = false;
//uint64_t ps16dz_seq = 0; uint8_t ps16dz_dimmer = 0;
uint8_t ps16dz_color[3]; // Most recent serial sent/received values
char *ps16dz_tx_buffer = nullptr; // Serial transmit buffer char *ps16dz_tx_buffer = nullptr; // Serial transmit buffer
char *ps16dz_rx_buffer = nullptr; // Serial receive buffer char *ps16dz_rx_buffer = nullptr; // Serial receive buffer
int ps16dz_byte_counter = 0; int ps16dz_byte_counter = 0;
@ -44,74 +53,99 @@ int ps16dz_byte_counter = 0;
* Internal Functions * Internal Functions
\*********************************************************************************************/ \*********************************************************************************************/
void printTimestamp(void)
{
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s%d%03d"), ps16dz_tx_buffer, LocalTime(), millis()%1000);
}
void PS16DZSendCommand(char type = 0, uint8_t value = 0)
{
switch(type){
case PS16DZ_TYPE_ACK:
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "AT+SEND=ok"));
break;
case PS16DZ_TYPE_PWR:
case PS16DZ_TYPE_DIM:
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "AT+UPDATE=\"sequence\":\""));
printTimestamp();
if ( type == PS16DZ_TYPE_PWR) {
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s\",\"switch\":\"%s\""), ps16dz_tx_buffer, value?"on":"off");
}
else if ( type == PS16DZ_TYPE_DIM) {
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s\",\"bright\":%d"), ps16dz_tx_buffer, round(value * (100. / 255.)));
}
break;
}
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send serial command: %s"), ps16dz_tx_buffer );
PS16DZSerial->print(ps16dz_tx_buffer);
PS16DZSerial->write(0x1B);
PS16DZSerial->flush();
}
bool PS16DZSetPower(void) bool PS16DZSetPower(void)
{ {
bool status = false; return PS16DZSerialSendUpdateCommandIfRequired();
uint8_t rpower = XdrvMailbox.index;
int16_t source = XdrvMailbox.payload;
if (source != SRC_SWITCH && PS16DZSerial) { // ignore to prevent loop from pushing state from faceplate interaction
PS16DZSendCommand(PS16DZ_TYPE_PWR, rpower);
status = true;
}
return status;
} }
bool PS16DZSetChannels(void) bool PS16DZSetChannels(void)
{ {
PS16DZSerialDuty(((uint8_t*)XdrvMailbox.data)[0]); return PS16DZSerialSendUpdateCommandIfRequired();
}
bool PS16DZSerialSendUpdateCommandIfRequired()
{
if(!PS16DZSerial) return true;
bool is_switch_change = PS16DZSwitchHasChanged();
bool is_brightness_change = PS16DZDimmerHasChanged();
bool is_color_change = ps16dz_supports_color && PS16DZColorHasChanged();
bool change_has_occurred = is_switch_change || is_brightness_change || is_color_change;
if(change_has_occurred)
{
PS16DZSerialSendUpdateCommand();
}
return true; return true;
} }
void PS16DZSerialDuty(uint8_t duty) bool PS16DZSwitchHasChanged()
{ {
if (duty > 0 && !ps16dz_ignore_dim && PS16DZSerial) { int16_t source = XdrvMailbox.payload;
if (duty < 25) { bool source_is_valid = source != SRC_SWITCH;
duty = 25; // dimming acts odd below 25(10%) - this mirrors the threshold set on the faceplate itself return source_is_valid;
} }
PS16DZSendCommand(PS16DZ_TYPE_DIM, duty); bool PS16DZDimmerHasChanged()
{
} else { uint8_t light_state_dimmer = light_state.getDimmer();
ps16dz_ignore_dim = false; // reset flag bool dimmer_has_changed = light_state_dimmer != ps16dz_dimmer;
return dimmer_has_changed;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send Dim Level skipped due to 0 or already set. Value=%d"), duty);
} }
bool PS16DZColorHasChanged()
{
uint8_t light_state_rgb[3];
light_state.getRGB(&light_state_rgb[0], &light_state_rgb[1], &light_state_rgb[2]);
bool color_has_changed = memcmp(light_state_rgb, ps16dz_color, 3) != 0;
return color_has_changed;
}
// Send a serial update command to the LED controller
// For dimmer types:
// AT+UPDATE="sequence":"1554682835320","switch":"on":"bright":100
// For color types:
// AT+UPDATE="sequence":"1554682835320","switch":"on":,"bright":100,"mode":1,"colorR":255,"colorG":46,"colorB":101,"light_types":1
void PS16DZSerialSendUpdateCommand()
{
uint8_t light_state_dimmer;
light_state_dimmer = light_state.getDimmer();
// Dimming acts odd below 10% - this mirrors the threshold set on the faceplate itself
light_state_dimmer = (light_state_dimmer < 10) ? 10 : light_state_dimmer;
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "AT+UPDATE=\"sequence\":\""));
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s%d%03d"), ps16dz_tx_buffer, LocalTime(), millis()%1000);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s\",\"switch\":\"%s\""), ps16dz_tx_buffer, power?"on":"off");
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"bright\":%d"), ps16dz_tx_buffer, light_state_dimmer);
if(ps16dz_supports_color)
{
int light_types_value = 1;
uint8_t light_state_rgb[3];
light_state.getRGB(&light_state_rgb[0], &light_state_rgb[1], &light_state_rgb[2]);
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, light_state_rgb[0]);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"colorG\":%d"), ps16dz_tx_buffer, light_state_rgb[1]);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"colorB\":%d"), ps16dz_tx_buffer, light_state_rgb[2]);
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "%s,\"light_types\":%d"), ps16dz_tx_buffer, light_types_value);
}
PS16DZSerialSendTxBuffer();
}
void PS16DZSerialSendOkCommand()
{
snprintf_P(ps16dz_tx_buffer, PS16DZ_BUFFER_SIZE, PSTR( "AT+SEND=ok"));
PS16DZSerialSendTxBuffer();
}
void PS16DZSerialSendTxBuffer()
{
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) void PS16DZResetWifi(void)
@ -129,12 +163,24 @@ void PS16DZResetWifi(void)
bool PS16DZModuleSelected(void) bool PS16DZModuleSelected(void)
{ {
switch (my_module_type)
{
case PS_16_DZ:
light_type = LT_SERIAL1; light_type = LT_SERIAL1;
break;
case SONOFF_L1:
light_type = LT_PWM3;
break;
}
return true; return true;
} }
void PS16DZInit(void) void PS16DZInit(void)
{ {
ps16dz_supports_color = light_state.getColorMode() == LCM_RGB;
ps16dz_tx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE)); ps16dz_tx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
if (ps16dz_tx_buffer != nullptr) { if (ps16dz_tx_buffer != nullptr) {
ps16dz_rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE)); ps16dz_rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
@ -165,40 +211,97 @@ void PS16DZSerialInput(void)
else { else {
ps16dz_rx_buffer[ps16dz_byte_counter++] = 0x00; ps16dz_rx_buffer[ps16dz_byte_counter++] = 0x00;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: command received: %s"), ps16dz_rx_buffer); 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 *end_str;
char *string = ps16dz_rx_buffer+10; char *string = ps16dz_rx_buffer+10;
char* token = strtok_r(string, ",", &end_str); char* token = strtok_r(string, ",", &end_str);
bool color_updated[3] = { false, false, false };
memcpy(ps16dz_color, Settings.light_color, 3);
bool is_switch_change = false;
bool is_color_change = false;
bool is_brightness_change = false;
while (token != nullptr) { while (token != nullptr) {
char* end_token; char* end_token;
char* token2 = strtok_r(token, ":", &end_token); char* token2 = strtok_r(token, ":", &end_token);
char* token3 = strtok_r(nullptr, ":", &end_token); char* token3 = strtok_r(nullptr, ":", &end_token);
if(!strncmp(token2, "\"switch\"", 8)){ 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); ps16dz_switch = !strncmp(token3, "\"on\"", 4)?true:false;
if((power || Settings.light_dimmer > 0) && (power !=ps16dz_power)) { AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: switch received: %d"), ps16dz_switch);
ExecuteCommandPower(1, ps16dz_power, SRC_SWITCH); // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
is_switch_change = ps16dz_switch != power;
if(is_switch_change) {
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send CMND_POWER=%d"), ps16dz_switch );
ExecuteCommandPower(1, ps16dz_switch, SRC_SWITCH); // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
}
}
else if(!strncmp(token2, "\"color", 6)) {
char color_channel_name = token2[6];
int color_index;
switch(color_channel_name)
{
case 'R': color_index = 0;
break;
case 'G': color_index = 1;
break;
case 'B': color_index = 2;
break;
}
int color_value = atoi(token3);
ps16dz_color[color_index] = color_value;
color_updated[color_index] = true;
bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
if(all_color_channels_updated)
{
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: color received: R:%d, G:%d, B:%d"),
ps16dz_color[0], ps16dz_color[1], ps16dz_color[2]);
is_color_change = memcmp(ps16dz_color, Settings.light_color, 3) != 0;
}
if(power && is_color_change)
{
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_COLOR "2 %02x%02x%02x"),
ps16dz_color[0], ps16dz_color[1], ps16dz_color[2]);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Send CMND_COLOR_STR=%s"), scmnd );
ExecuteCommand(scmnd, SRC_SWITCH);
} }
} }
else if(!strncmp(token2, "\"bright\"", 8)){ 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) {
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), ps16dz_bright ); ps16dz_dimmer = atoi(token3);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: brightness received: %d"), ps16dz_dimmer);
is_brightness_change = ps16dz_dimmer != Settings.light_dimmer;
if(power && ps16dz_dimmer > 0 && is_brightness_change) {
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), ps16dz_dimmer );
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); ExecuteCommand(scmnd, SRC_SWITCH);
} }
} }
else if(!strncmp(token2, "\"sequence\"", 10)){ else if(!strncmp(token2, "\"sequence\"", 10)){
//ps16dz_seq = strtoull(token3+1, nullptr, 10);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: sequence received: %s"), token3); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: sequence received: %s"), token3);
} }
token = strtok_r(nullptr, ",", &end_str); token = strtok_r(nullptr, ",", &end_str);
} }
if(!is_color_change && !is_brightness_change)
{
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PSZ: Update received"));
PS16DZSerialSendOkCommand();
}
} }
else if(!strncmp(ps16dz_rx_buffer+3, "SETTING", 7)) { else if(!strncmp(ps16dz_rx_buffer+3, "SETTING", 7)) {
AddLog_P(LOG_LEVEL_DEBUG, PSTR("PSZ: Reset")); AddLog_P(LOG_LEVEL_DEBUG, PSTR("PSZ: Reset"));
@ -206,8 +309,6 @@ void PS16DZSerialInput(void)
} }
memset(ps16dz_rx_buffer, 0, PS16DZ_BUFFER_SIZE); memset(ps16dz_rx_buffer, 0, PS16DZ_BUFFER_SIZE);
ps16dz_byte_counter = 0; ps16dz_byte_counter = 0;
PS16DZSendCommand();
} }
} }
} }
@ -222,7 +323,8 @@ bool Xdrv19(uint8_t function)
{ {
bool result = false; bool result = false;
if (PS_16_DZ == my_module_type) { if (PS_16_DZ == my_module_type ||
SONOFF_L1 == my_module_type) {
switch (function) { switch (function) {
case FUNC_LOOP: case FUNC_LOOP:
if (PS16DZSerial) { PS16DZSerialInput(); } if (PS16DZSerial) { PS16DZSerialInput(); }