From b8edfddd7e19f67816843bd36847c2097ae51d47 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 27 May 2018 14:13:14 +0200 Subject: [PATCH 1/2] Fix Pow R2 and S31 checksum error Fix Pow R2 and S31 checksum error (#1907) --- sonoff/xdrv_03_energy.ino | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index b3d717d65..d6d27c718 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -371,7 +371,12 @@ bool CseSerialInput() return 1; } } else { - if (0x5A == serial_in_byte) { // 0x5A - Packet header 2 + if ((0x5A == serial_in_byte) && (serial_in_byte_counter)) { // 0x5A - Packet header 2 + if (serial_in_byte_counter > 1) { // Sync buffer with data (issue #1907) + serial_in_buffer[0] = serial_in_buffer[--serial_in_byte_counter]; + serial_in_byte_counter = 1; + AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Fixed out-of-sync")); + } cse_receive_flag = 1; } else { serial_in_byte_counter = 0; From 1c96097c7a81df3c8be2ab5c049776bea0d2d1b7 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 27 May 2018 14:14:41 +0200 Subject: [PATCH 2/2] Fix sdm120/630 compile error Fix sdm120/630 compile error when webserver is disabled (#2764) --- sonoff/xsns_23_sdm120.ino | 2 +- sonoff/xsns_25_sdm630.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/xsns_23_sdm120.ino b/sonoff/xsns_23_sdm120.ino index 937efc89e..5966f9cd3 100644 --- a/sonoff/xsns_23_sdm120.ino +++ b/sonoff/xsns_23_sdm120.ino @@ -262,8 +262,8 @@ void SDM120Show(boolean json) #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_SDM120_DATA, mqtt_data, voltage, current, active_power, apparent_power, reactive_power, power_factor, frequency, energy_total); - } #endif // USE_WEBSERVER + } } /*********************************************************************************************\ diff --git a/sonoff/xsns_25_sdm630.ino b/sonoff/xsns_25_sdm630.ino index 40dc8d0f9..193c3a936 100644 --- a/sonoff/xsns_25_sdm630.ino +++ b/sonoff/xsns_25_sdm630.ino @@ -317,8 +317,8 @@ void SDM630Show(boolean json) active_power_l1, active_power_l2, active_power_l3, reactive_power_l1, reactive_power_l2, reactive_power_l3, power_factor_l1, power_factor_l2, power_factor_l3, energy_total); - } #endif // USE_WEBSERVER + } } /*********************************************************************************************\