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 pull request #1759 from MichaelDvP/dev

Browse Source
This commit is contained in:
Proddy
2024-05-10 15:15:39 +02:00
committed by GitHub
parent 24af84f27c 4f6399f35e
commit f8050f3638
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/roomcontrol.cpp
View File

@@ -21,12 +21,13 @@
namespace emsesp { namespace emsesp {
// init statics // init statics
bool Roomctrl::switch_off_[HCS] = {false, false, false, false}; bool Roomctrl::switch_off_[HCS] = {false, false, false, false};
uint32_t Roomctrl::rc_time_[HCS] = {0, 0, 0, 0}; uint32_t Roomctrl::send_time_[HCS] = {0, 0, 0, 0};
int16_t Roomctrl::remotetemp_[HCS] = {EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET}; uint32_t Roomctrl::receive_time_[HCS] = {0, 0, 0, 0};
uint8_t Roomctrl::remotehum_[HCS] = {EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET}; int16_t Roomctrl::remotetemp_[HCS] = {EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET, EMS_VALUE_INT16_NOTSET};
uint8_t Roomctrl::sendtype_[HCS] = {SendType::TEMP, SendType::TEMP, SendType::TEMP, SendType::TEMP}; uint8_t Roomctrl::remotehum_[HCS] = {EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET, EMS_VALUE_UINT8_NOTSET};
uint8_t Roomctrl::type_[HCS] = {RemoteType::NONE, RemoteType::NONE, RemoteType::NONE, RemoteType::NONE}; uint8_t Roomctrl::sendtype_[HCS] = {SendType::TEMP, SendType::TEMP, SendType::TEMP, SendType::TEMP};
uint8_t Roomctrl::type_[HCS] = {RemoteType::NONE, RemoteType::NONE, RemoteType::NONE, RemoteType::NONE};
/** /**
* set the temperature, * set the temperature,
@@ -38,19 +39,20 @@ void Roomctrl::set_remotetemp(const uint8_t type, const uint8_t hc, const int16_
if (remotetemp_[hc] != EMS_VALUE_INT16_NOTSET && temp == EMS_VALUE_INT16_NOTSET) { // switch remote off if (remotetemp_[hc] != EMS_VALUE_INT16_NOTSET && temp == EMS_VALUE_INT16_NOTSET) { // switch remote off
remotetemp_[hc] = EMS_VALUE_INT16_NOTSET; remotetemp_[hc] = EMS_VALUE_INT16_NOTSET;
switch_off_[hc] = true; switch_off_[hc] = true;
rc_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now send_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now
sendtype_[hc] = SendType::TEMP; sendtype_[hc] = SendType::TEMP;
return; return;
} }
if (hc >= HCS || (type != RC20 && type != FB10 && type != RC100H && type != SENSOR && type != RC200 && type != RC100)) { if (hc >= HCS || (type != RC20 && type != FB10 && type != RC100H && type != SENSOR && type != RC200 && type != RC100)) {
return; return;
} }
type_[hc] = type;
if (remotetemp_[hc] != temp) { if (remotetemp_[hc] != temp) {
rc_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now send_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now
sendtype_[hc] = SendType::TEMP; sendtype_[hc] = SendType::TEMP;
} }
remotetemp_[hc] = temp; type_[hc] = type;
remotetemp_[hc] = temp;
receive_time_[hc] = uuid::get_uptime();
} }
// set humidity for RC100H emulation // set humidity for RC100H emulation
@@ -59,8 +61,8 @@ void Roomctrl::set_remotehum(const uint8_t type, const uint8_t hc, const int8_t
return; return;
} }
if (remotehum_[hc] != hum) { if (remotehum_[hc] != hum) {
rc_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now send_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now
sendtype_[hc] = SendType::HUMI; sendtype_[hc] = SendType::HUMI;
} }
remotehum_[hc] = hum; remotehum_[hc] = hum;
} }
@@ -94,31 +96,38 @@ void Roomctrl::send(uint8_t addr) {
return; return;
} }
if (uuid::get_uptime() - rc_time_[hc] > SEND_INTERVAL) { // check interval if ((uuid::get_uptime() - receive_time_[hc]) > TIMEOUT) {
remotetemp_[hc] = EMS_VALUE_INT16_NOTSET;
switch_off_[hc] = true;
send_time_[hc] = uuid::get_uptime() - SEND_INTERVAL; // send now
sendtype_[hc] = SendType::TEMP;
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 (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]) {
remotehum_[hc] = EMS_VALUE_UINT8_NOTSET; remotehum_[hc] = EMS_VALUE_UINT8_NOTSET;
} }
rc_time_[hc] = uuid::get_uptime(); send_time_[hc] = uuid::get_uptime();
humidity(addr, 0x10, hc); humidity(addr, 0x10, hc);
sendtype_[hc] = SendType::TEMP; sendtype_[hc] = SendType::TEMP;
} else { // temperature telegram } else { // temperature telegram
if (remotehum_[hc] != EMS_VALUE_UINT8_NOTSET) { if (remotehum_[hc] != EMS_VALUE_UINT8_NOTSET) {
sendtype_[hc] = SendType::HUMI; sendtype_[hc] = SendType::HUMI;
} else { } else {
rc_time_[hc] = uuid::get_uptime(); send_time_[hc] = uuid::get_uptime();
} }
temperature(addr, 0x10, hc); // send to master-thermostat temperature(addr, 0x10, hc); // send to master-thermostat
} }
} else if (type_[hc] == RC200 || type_[hc] == RC100) { } else if (type_[hc] == RC200 || type_[hc] == RC100) {
rc_time_[hc] = uuid::get_uptime(); send_time_[hc] = uuid::get_uptime();
temperature(addr, 0x10, hc); temperature(addr, 0x10, hc);
} else if (type_[hc] == FB10) { } else if (type_[hc] == FB10) {
rc_time_[hc] = uuid::get_uptime(); send_time_[hc] = uuid::get_uptime();
temperature(addr, 0x10, hc); // send to master-thermostat (https://github.com/emsesp/EMS-ESP32/issues/336) temperature(addr, 0x10, hc); // send to master-thermostat (https://github.com/emsesp/EMS-ESP32/issues/336)
} else { // type==RC20 or SENSOR } else { // type==RC20 or SENSOR
rc_time_[hc] = uuid::get_uptime(); send_time_[hc] = uuid::get_uptime();
temperature(addr, 0x00, hc); // send to all temperature(addr, 0x00, hc); // send to all
} }
if (remotehum_[hc] == EMS_VALUE_UINT8_NOTSET && switch_off_[hc]) { if (remotehum_[hc] == EMS_VALUE_UINT8_NOTSET && switch_off_[hc]) {

8
src/roomcontrol.h
View File

@@ -36,8 +36,9 @@ class Roomctrl {
} }
private: private:
static constexpr uint32_t SEND_INTERVAL = 15000; // 15 sec static constexpr uint32_t SEND_INTERVAL = 15000; // 15 sec
static constexpr uint8_t HCS = 4; // max 4 heating circuits static constexpr uint32_t TIMEOUT = 10800000; // 3 hour
static constexpr uint8_t HCS = 4; // max 4 heating circuits
enum SendType : uint8_t { TEMP, HUMI }; enum SendType : uint8_t { TEMP, HUMI };
static uint8_t get_hc(const uint8_t addr); static uint8_t get_hc(const uint8_t addr);
@@ -52,7 +53,8 @@ class Roomctrl {
static int16_t calc_dew(int16_t temp, uint8_t hum); static int16_t calc_dew(int16_t temp, uint8_t hum);
static bool switch_off_[HCS]; static bool switch_off_[HCS];
static uint32_t rc_time_[HCS]; static uint32_t send_time_[HCS];
static uint32_t receive_time_[HCS];
static int16_t remotetemp_[HCS]; static int16_t remotetemp_[HCS];
static uint8_t remotehum_[HCS]; static uint8_t remotehum_[HCS];
static uint8_t sendtype_[HCS]; static uint8_t sendtype_[HCS];