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

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
Proddy
2024-05-18 09:35:02 +02:00
committed by GitHub
parent 98fbb2b926 ab9241376b
commit c8b0e07203
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/devices/thermostat.cpp
View File

@@ -1542,18 +1542,18 @@ void Thermostat::process_RC30Vacation(std::shared_ptr<const Telegram> telegram)
} }
static uint8_t vacation_telegram[57] = {0}; // make a copy of the whole telegram to access blocks static uint8_t vacation_telegram[57] = {0}; // make a copy of the whole telegram to access blocks
memcpy(&vacation_telegram[telegram->offset], telegram->message_data, telegram->message_length); memcpy(&vacation_telegram[telegram->offset], telegram->message_data, telegram->message_length);
for (uint8_t index = 0; index < 8; index++) { for (uint8_t index = 0, pos = 0; index < 8; index++, pos += 7) {
char data[sizeof(vacation[0]) + 4]; // avoid compiler warning char data[sizeof(vacation[0]) + 4]; // avoid compiler warning
snprintf(data, snprintf(data,
sizeof(data), sizeof(data),
"%02d.%02d.%04d-%02d.%02d.%04d", "%02d.%02d.%04d-%02d.%02d.%04d",
vacation_telegram[1 + 7 * index], vacation_telegram[1 + pos],
vacation_telegram[2 + 7 * index], vacation_telegram[2 + pos],
vacation_telegram[3 + 7 * index] + 2000, vacation_telegram[3 + pos] + 2000,
vacation_telegram[4 + 7 * index], vacation_telegram[4 + pos],
vacation_telegram[5 + 7 * index], vacation_telegram[5 + pos],
vacation_telegram[6 + 7 * index] + 2000); vacation_telegram[6 + pos] + 2000);
if (data[1] > '0') { if (vacation_telegram[1 + pos]) { // data is set (day > 0)
has_update(vacation[index], data, sizeof(vacation[0])); has_update(vacation[index], data, sizeof(vacation[0]));
} }
} }

5
src/roomcontrol.cpp
View File

@@ -96,14 +96,13 @@ void Roomctrl::send(uint8_t addr) {
return; return;
} }
if ((uuid::get_uptime() - receive_time_[hc]) > TIMEOUT) { if (!switch_off_[hc] && (uuid::get_uptime() - receive_time_[hc]) > TIMEOUT) {
remotetemp_[hc] = EMS_VALUE_INT16_NOTSET; remotetemp_[hc] = EMS_VALUE_INT16_NOTSET;
switch_off_[hc] = true; switch_off_[hc] = true;
send_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now
sendtype_[hc] = SendType::TEMP; sendtype_[hc] = SendType::TEMP;
EMSESP::logger().warning("remotetemp timeout hc%d, stop sending roomtemperature to thermostat", hc); EMSESP::logger().warning("remotetemp timeout hc%d, stop sending roomtemperature to thermostat", hc);
} }
if (uuid::get_uptime() - send_time_[hc] > SEND_INTERVAL) { // check interval if (switch_off_[hc] || (uuid::get_uptime() - send_time_[hc]) > SEND_INTERVAL) { // check interval
if (type_[hc] == RC100H) { if (type_[hc] == RC100H) {
if (sendtype_[hc] == SendType::HUMI) { // send humidity if (sendtype_[hc] == SendType::HUMI) { // send humidity
if (switch_off_[hc]) { if (switch_off_[hc]) {