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

check lastcode, fix #2189, allow setting silentfrom/to as hh:mm

Browse Source
This commit is contained in:
MichaelDvP
2024-11-08 16:10:20 +01:00
parent afc2afbac0
commit df92e9253f
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/devices/boiler.cpp
View File

@@ -1828,6 +1828,10 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr<const Telegram> telegram) {
uint8_t min = telegram->message_data[8]; uint8_t min = telegram->message_data[8];
uint16_t duration = telegram->message_data[9] * 256 + telegram->message_data[10]; uint16_t duration = telegram->message_data[9] * 256 + telegram->message_data[10];
uint32_t date = (year - 2000) * 535680UL + month * 44640UL + day * 1440UL + hour * 60 + min + duration; uint32_t date = (year - 2000) * 535680UL + month * 44640UL + day * 1440UL + hour * 60 + min + duration;
// check valid https://github.com/emsesp/EMS-ESP32/issues/2189
if (day == 0 || day > 31 || month == 0 || month > 12 || !std::isprint(code[0]) || !std::isprint(code[1])) {
return;
}
// store only the newest code from telegrams 10 and 11 // store only the newest code from telegrams 10 and 11
if (date > lastCodeDate_ && lastCodeDate_) { if (date > lastCodeDate_ && lastCodeDate_) {
lastCodeDate_ = date; lastCodeDate_ = date;
@@ -1855,6 +1859,9 @@ void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram)
code[2] = telegram->message_data[7]; code[2] = telegram->message_data[7];
code[3] = 0; code[3] = 0;
telegram->read_value(codeNo, 8); telegram->read_value(codeNo, 8);
if (!std::isprint(code[0]) || !std::isprint(code[1]) || !std::isprint(code[2])) {
return;
}
// check for valid date, https://github.com/emsesp/EMS-ESP32/issues/204 // check for valid date, https://github.com/emsesp/EMS-ESP32/issues/204
if (telegram->message_data[10] & 0x80) { if (telegram->message_data[10] & 0x80) {
@@ -2970,19 +2977,19 @@ bool Boiler::set_silentMode(const char * value, const int8_t id) {
} }
bool Boiler::set_silentFrom(const char * value, const int8_t id) { bool Boiler::set_silentFrom(const char * value, const int8_t id) {
int v; if (value == nullptr || value[0] < '0' || value[0] > '9') {
if (!Helpers::value2number(value, v)) {
return false; return false;
} }
auto v = Helpers::string2minutes(value);
write_command(0x484, 52, v / 15, 0x484); write_command(0x484, 52, v / 15, 0x484);
return true; return true;
} }
bool Boiler::set_silentTo(const char * value, const int8_t id) { bool Boiler::set_silentTo(const char * value, const int8_t id) {
int v; if (value == nullptr || value[0] < '0' || value[0] > '9') {
if (!Helpers::value2number(value, v)) {
return false; return false;
} }
auto v = Helpers::string2minutes(value);
write_command(0x484, 53, v / 15, 0x484); write_command(0x484, 53, v / 15, 0x484);
return true; return true;
} }