andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix set_switchtime

Browse Source
This commit is contained in:
MichaelDvP
2022-04-12 18:56:23 +02:00
parent ec1b0b3641
commit 94f5d4d503
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/devices/thermostat.cpp
View File

@@ -631,7 +631,7 @@ void Thermostat::process_RC20Timer(std::shared_ptr<const Telegram> telegram) {
char data[sizeof(hc->switchtime1)]; char data[sizeof(hc->switchtime1)];
uint8_t no = telegram->offset / 2; uint8_t no = telegram->offset / 2;
uint8_t day = telegram->message_data[0] >> 5; uint8_t day = telegram->message_data[0] >> 5;
uint8_t temp = telegram->message_data[0] & 1; uint8_t temp = telegram->message_data[0] & 7;
uint8_t time = telegram->message_data[1]; uint8_t time = telegram->message_data[1];
std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]); std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
@@ -1176,14 +1176,12 @@ void Thermostat::process_RC35Timer(std::shared_ptr<const Telegram> telegram) {
char data[sizeof(hc->switchtime1)]; char data[sizeof(hc->switchtime1)];
uint8_t no = telegram->offset / 2; uint8_t no = telegram->offset / 2;
uint8_t day = telegram->message_data[0] >> 5; uint8_t day = telegram->message_data[0] >> 5;
uint8_t on = telegram->message_data[0] & 0x07; uint8_t on = telegram->message_data[0] & 1;
uint8_t time = telegram->message_data[1]; uint8_t time = telegram->message_data[1];
std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]); std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
if (day == 7) { if (day == 7) {
snprintf(data, sizeof(data), "%02d not_set", no); snprintf(data, sizeof(data), "%02d not_set", no);
} else if (model() == EMS_DEVICE_FLAG_RC30_N) {
snprintf(data, sizeof(data), "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on);
} else { } else {
snprintf(data, sizeof(data), "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off"); snprintf(data, sizeof(data), "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off");
} }
@@ -2470,8 +2468,8 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
data[1] = time; data[1] = time;
} }
uint8_t max_on = 3; uint8_t max_on = 4;
if (model() == EMS_DEVICE_FLAG_RC35) { if (model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N) {
max_on = 1; max_on = 1;
} }
if (no > 41 || time > 0x90 || (on > max_on && on != 7)) { if (no > 41 || time > 0x90 || (on > max_on && on != 7)) {
@@ -2481,10 +2479,8 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
} }
if (data[0] != 0xE7) { if (data[0] != 0xE7) {
std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]); std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day]);
if (model() == EMS_DEVICE_FLAG_RC35) { if (model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N) {
snprintf(out, len, "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off"); snprintf(out, len, "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off");
} else if (model() == EMS_DEVICE_FLAG_RC30_N) {
snprintf(out, len, "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on + 1);
} else if (model() == EMS_DEVICE_FLAG_RC20) { } else if (model() == EMS_DEVICE_FLAG_RC20) {
snprintf(out, len, "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on); snprintf(out, len, "%02d %s %02d:%02d T%d", no, sday.c_str(), time / 6, 10 * (time % 6), on);
} else { } else {