jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 14:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Sonoff L1 debugging

Browse Source
This commit is contained in:
Theo Arends 2020-11-09 13:52:42 +01:00
parent 2f05d8707d
commit 40e58c0702
2 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tasmota/xdrv_04_light.ino
View File

@ -2220,34 +2220,32 @@ void LightSetOutputs(const uint16_t *cur_col_10) {
} }
} }
} }
} else {
// char msg[24];
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"), ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
// Some devices need scaled RGB like Sonoff L1
// TODO, should be probably moved to the Sonoff L1 support code
uint32_t max = (cur_col_10[0] > cur_col_10[1] && cur_col_10[0] > cur_col_10[2]) ? cur_col_10[0] : (cur_col_10[1] > cur_col_10[2]) ? cur_col_10[1] : cur_col_10[2]; // 0..1023
uint8_t scale_col[3];
for (uint32_t i = 0; i < 3; i++) {
scale_col[i] = (0 == max) ? 255 : changeUIntScale(cur_col_10[i], 0, max, 0, 255);
}
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: CurCol %03X %03X %03X, ScaleCol %02X %02X %02X, Max %02X"),
// cur_col_10[0], cur_col_10[1], cur_col_10[2], scale_col[0], scale_col[1], scale_col[2], max);
uint8_t cur_col[LST_MAX];
for (uint32_t i = 0; i < LST_MAX; i++) {
cur_col[i] = change10to8(cur_col_10[i]);
}
char *tmp_data = XdrvMailbox.data;
char *tmp_topic = XdrvMailbox.topic;
XdrvMailbox.data = (char*)cur_col;
XdrvMailbox.topic = (char*)scale_col;
if (XlgtCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
else if (XdrvCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
XdrvMailbox.data = tmp_data;
XdrvMailbox.topic = tmp_topic;
} }
// char msg[24];
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"), ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
// Some devices need scaled RGB like Sonoff L1
uint32_t max = (cur_col_10[0] > cur_col_10[1] && cur_col_10[0] > cur_col_10[2]) ? cur_col_10[0] : (cur_col_10[1] > cur_col_10[2]) ? cur_col_10[1] : cur_col_10[2]; // 0..1023
uint8_t scale_col[3];
for (uint32_t i = 0; i < 3; i++) {
scale_col[i] = (0 == max) ? 255 : changeUIntScale(cur_col_10[i], 0, max, 0, 255);
}
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: CurCol %03X %03X %03X, ScaleCol %02X %02X %02X, Max %02X"),
// cur_col_10[0], cur_col_10[1], cur_col_10[2], scale_col[0], scale_col[1], scale_col[2], max);
uint8_t cur_col[LST_MAX];
for (uint32_t i = 0; i < LST_MAX; i++) {
cur_col[i] = change10to8(cur_col_10[i]);
}
char *tmp_data = XdrvMailbox.data;
char *tmp_topic = XdrvMailbox.topic;
XdrvMailbox.data = (char*)cur_col;
XdrvMailbox.topic = (char*)scale_col;
if (XlgtCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
else if (XdrvCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
XdrvMailbox.data = tmp_data;
XdrvMailbox.topic = tmp_topic;
} }
// Just apply basic Gamma to each channel // Just apply basic Gamma to each channel

30
tasmota/xlgt_05_sonoff_l1.ino
View File

@ -52,7 +52,7 @@ struct SNFL1 {
void SnfL1Send(const char *buffer) void SnfL1Send(const char *buffer)
{ {
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Send %s"), buffer); AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Send %s"), buffer);
Serial.print(buffer); Serial.print(buffer);
Serial.write(0x1B); Serial.write(0x1B);
@ -82,7 +82,7 @@ bool SnfL1SerialInput(void)
// AT+RESULT="sequence":"1554682835320" // AT+RESULT="sequence":"1554682835320"
// AT+UPDATE="sequence":"34906","switch":"on","light_type":1,"colorR":0,"colorG":16,"colorB":0,"bright":6,"mode":1 // AT+UPDATE="sequence":"34906","switch":"on","light_type":1,"colorR":0,"colorG":16,"colorB":0,"bright":6,"mode":1
// AT+UPDATE="switch":"on","light_type":1,"colorR":255,"colorG":0,"colorB":0,"bright":6,"mode":1,"speed":100,"sensitive":10 // AT+UPDATE="switch":"on","light_type":1,"colorR":255,"colorG":0,"colorB":0,"bright":6,"mode":1,"speed":100,"sensitive":10
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Rcvd %s"), TasmotaGlobal.serial_in_buffer); AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Rcvd %s"), TasmotaGlobal.serial_in_buffer);
if (!strncmp(TasmotaGlobal.serial_in_buffer +3, "RESULT", 6)) { if (!strncmp(TasmotaGlobal.serial_in_buffer +3, "RESULT", 6)) {
Snfl1.receive_ready = true; Snfl1.receive_ready = true;
@ -95,8 +95,6 @@ bool SnfL1SerialInput(void)
char *token = strtok_r(string, ",", &end_str); char *token = strtok_r(string, ",", &end_str);
bool color_updated[3] = { false, false, false }; bool color_updated[3] = { false, false, false };
uint8_t current_color[3];
memcpy(current_color, Settings.light_color, 3);
bool switch_state = false; bool switch_state = false;
bool is_power_change = false; bool is_power_change = false;
@ -126,8 +124,7 @@ bool SnfL1SerialInput(void)
else if (!strncmp(token2, "\"color", 6)) { else if (!strncmp(token2, "\"color", 6)) {
char color_channel_name = token2[6]; char color_channel_name = token2[6];
int color_index; int color_index;
switch(color_channel_name) switch(color_channel_name) {
{
case 'R': color_index = 0; case 'R': color_index = 0;
break; break;
case 'G': color_index = 1; case 'G': color_index = 1;
@ -136,20 +133,19 @@ bool SnfL1SerialInput(void)
break; break;
} }
int color_value = atoi(token3); int color_value = atoi(token3);
current_color[color_index] = color_value;
color_updated[color_index] = true;
Snfl1.color[color_index] = color_value; Snfl1.color[color_index] = color_value;
color_updated[color_index] = true;
bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2]; bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
if (all_color_channels_updated) { if (all_color_channels_updated) {
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Rcvd color R%d G%d B%d (R%d G%d B%d)"), // AddLog_P(LOG_LEVEL_DEBUG, PSTR("SL1: Rcvd color R%d G%d B%d (R%d G%d B%d)"),
// current_color[0], current_color[1], current_color[2], // Snfl1.color[0], Snfl1.color[1], Snfl1.color[2],
// Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]); // Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]);
is_color_change = (Light.power && (memcmp(current_color, Settings.light_color, 3) != 0)); is_color_change = (Light.power && (memcmp(Snfl1.color, Settings.light_color, 3) != 0));
} }
snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), current_color[0], current_color[1], current_color[2]); snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), Snfl1.color[0], Snfl1.color[1], Snfl1.color[2]);
} }
else if (!strncmp(token2, "\"bright\"", 8)) { else if (!strncmp(token2, "\"bright\"", 8)) {
@ -208,22 +204,20 @@ bool SnfL1SerialInput(void)
bool SnfL1SetChannels(void) bool SnfL1SetChannels(void)
{ {
// if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) { // if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) {
uint8_t power = Light.power; uint8_t power = Light.power;
uint8_t dimmer = light_state.getDimmer();
uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
bool power_changed = (Snfl1.power != power); bool power_changed = (Snfl1.power != power);
Snfl1.power = power; Snfl1.power = power;
uint8_t dimmer = light_state.getDimmer();
bool dimmer_changed = (Snfl1.dimmer != dimmer); bool dimmer_changed = (Snfl1.dimmer != dimmer);
Snfl1.dimmer = dimmer; Snfl1.dimmer = dimmer;
uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
bool color_changed = false; bool color_changed = false;
if (!power_changed) { if (!power_changed) {
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
if ((Snfl1.color[i] < scale_col[i] -5) || (Snfl1.color[i] > scale_col[i] +5)) { if ((Snfl1.color[i] < scale_col[i] -5) || (Snfl1.color[i] > scale_col[i] +5)) {
color_changed = true; color_changed = true; // Allow scale-up margins of +/-5
} }
Snfl1.color[i] = scale_col[i]; Snfl1.color[i] = scale_col[i];
} }
@ -233,9 +227,9 @@ bool SnfL1SetChannels(void)
char buffer[140]; char buffer[140];
snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"), snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"),
LocalTime(), millis()%1000, LocalTime(), millis()%1000,
Light.power ? "on" : "off", Snfl1.power ? "on" : "off",
Snfl1.color[0], Snfl1.color[1], Snfl1.color[2], Snfl1.color[0], Snfl1.color[1], Snfl1.color[2],
light_state.getDimmer(), Snfl1.dimmer,
SONOFF_L1_MODE_COLORFUL); SONOFF_L1_MODE_COLORFUL);
SnfL1Send(buffer); SnfL1Send(buffer);