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

RC35 switchtime for prog 1 and prog 2

Browse Source
This commit is contained in:
MichaelDvP
2021-11-08 18:29:25 +01:00
parent 95f7583511
commit a3022f6f20
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/thermostat.cpp
View File

@@ -2051,6 +2051,7 @@ bool Thermostat::set_reducehours(const char * value, const int8_t id) {
// sets a single switchtime in the thermostat program for RC35 // sets a single switchtime in the thermostat program for RC35
// format "01:0,1,15:30" Number, day, on, time // format "01:0,1,15:30" Number, day, on, time
// format "1:01:0,1,15:30" Prog, number, day, on, time
bool Thermostat::set_switchtime(const char * value, const int8_t id) { bool Thermostat::set_switchtime(const char * value, const int8_t id) {
uint8_t hc_num = (id == -1) ? AUTO_HEATING_CIRCUIT : id; uint8_t hc_num = (id == -1) ? AUTO_HEATING_CIRCUIT : id;
std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(hc_num); std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(hc_num);
@@ -2060,15 +2061,28 @@ bool Thermostat::set_switchtime(const char * value, const int8_t id) {
} }
if (value == nullptr) { if (value == nullptr) {
return false; return false;
} else if (strlen(value) == 2) { // query point 01? }
uint8_t prog = 0;
// check for program 1 or 2
if (strlen(value) == 4 || strlen(value) == 14) {
prog = value[0] - '1';
value += 2;
if (prog > 1) {
return false;
}
prog *= 3; // offset
}
// only setpoint number returns data in response
if (strlen(value) == 2) {
uint8_t no = (value[0] - '0') * 10 + (value[1] - '0'); uint8_t no = (value[0] - '0') * 10 + (value[1] - '0');
if (no < 42) { if (no < 42) {
read_command(timer_typeids[hc->hc_num() - 1], 2 * no, 2); read_command(timer_typeids[hc->hc_num() - 1] + prog, 2 * no, 2);
return true; return true;
} }
return false; return false;
}
} else if (strlen(value) != 12) { // write dataset
if (strlen(value) != 12) {
LOG_WARNING(F("Setting switchtime: Invalid data")); LOG_WARNING(F("Setting switchtime: Invalid data"));
return false; return false;
} }
@@ -2089,7 +2103,7 @@ bool Thermostat::set_switchtime(const char * value, const int8_t id) {
} }
if ((model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N)) { if ((model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N)) {
write_command(timer_typeids[hc->hc_num() - 1], no * 2, (uint8_t *)&data, 2, timer_typeids[hc->hc_num() - 1]); write_command(timer_typeids[hc->hc_num() - 1] + prog, no * 2, (uint8_t *)&data, 2, timer_typeids[hc->hc_num() - 1]);
} else { } else {
LOG_WARNING(F("Setting switchtime: thermostat not supported")); LOG_WARNING(F("Setting switchtime: thermostat not supported"));
return false; return false;