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

disable remote dew if temp or humidity are missing, v3.6.3-dev.2d

Browse Source
This commit is contained in:
MichaelDvP
2023-10-11 10:36:59 +02:00
parent ecd37223e8
commit f5ab7510b4
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/roomcontrol.cpp
View File

@@ -51,7 +51,7 @@ void Roomctrl::set_remotehum(const uint8_t type, const uint8_t hc, const int8_t
return; return;
} }
type_ = type; type_ = type;
if (remotehum_[hc] != EMS_VALUE_SHORT_NOTSET && hum == EMS_VALUE_SHORT_NOTSET) { if (remotehum_[hc] != EMS_VALUE_UINT_NOTSET && hum == EMS_VALUE_UINT_NOTSET) {
switch_off_[hc] = true; switch_off_[hc] = true;
} }
if (remotehum_[hc] != hum) { if (remotehum_[hc] != hum) {
@@ -84,29 +84,35 @@ void Roomctrl::send(const uint8_t addr) {
return; return;
} }
// no reply if the temperature is not set // no reply if the temperature is not set
if (remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET && !switch_off_[hc]) { if (!switch_off_[hc] && remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET && remotehum_[hc] == EMS_VALUE_UINT_NOTSET) {
return; return;
} }
if (uuid::get_uptime() - rc_time_[hc] > SEND_INTERVAL) { // send every minute if (uuid::get_uptime() - rc_time_[hc] > SEND_INTERVAL) { // send every minute
if (type_ == FB10 || type_ == RC100H) { if (type_ == RC100H) {
if (sendcnt[hc] == 1) { if (sendcnt[hc] == 1) { // second telegram for humidity
if (switch_off_[hc]) {
remotehum_[hc] = EMS_VALUE_UINT_NOTSET;
}
rc_time_[hc] = uuid::get_uptime(); rc_time_[hc] = uuid::get_uptime();
humidity(addr, 0x10, hc); humidity(addr, 0x10, hc);
sendcnt[hc] = 0; sendcnt[hc] = 0;
} else { } else { // temperature telegram
if (remotehum_[hc] != EMS_VALUE_SHORT_NOTSET) { if (remotehum_[hc] != EMS_VALUE_UINT_NOTSET) {
sendcnt[hc] = 1; sendcnt[hc] = 1;
} else { } else {
rc_time_[hc] = uuid::get_uptime(); rc_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 { } else if (type_ == FB10) {
rc_time_[hc] = uuid::get_uptime();
temperature(addr, 0x10, hc); // send to master-thermostat (https://github.com/emsesp/EMS-ESP32/issues/336)
} else { // type==RC20
rc_time_[hc] = uuid::get_uptime(); rc_time_[hc] = uuid::get_uptime();
temperature(addr, 0x00, hc); // send to all temperature(addr, 0x00, hc); // send to all
} }
if (remotehum_[hc] == EMS_VALUE_SHORT_NOTSET) { if (remotehum_[hc] == EMS_VALUE_UINT_NOTSET) {
switch_off_[hc] = false; switch_off_[hc] = false;
} }
} else { } else {
@@ -148,7 +154,7 @@ void Roomctrl::check(const uint8_t addr, const uint8_t * data, const uint8_t len
temperature(addr, data[0], hc); temperature(addr, data[0], hc);
} else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x2B) { // EMS+ temperature } else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x2B) { // EMS+ temperature
temperature(addr, data[0], hc); temperature(addr, data[0], hc);
} else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x7B && remotehum_[hc] != EMS_VALUE_SHORT_NOTSET) { // EMS+ humidity } else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x7B && remotehum_[hc] != EMS_VALUE_UINT_NOTSET) { // EMS+ humidity
humidity(addr, data[0], hc); humidity(addr, data[0], hc);
} else if (length == 5) { // ems query } else if (length == 5) { // ems query
unknown(addr, data[0], data[2], data[3]); unknown(addr, data[0], data[2], data[3]);
@@ -254,7 +260,7 @@ void Roomctrl::humidity(uint8_t addr, uint8_t dst, uint8_t hc) {
data[3] = 0; data[3] = 0;
data[4] = 3; data[4] = 3;
data[5] = 0x7B; data[5] = 0x7B;
data[6] = (uint8_t)((dew + 5) / 10); data[6] = dew == EMS_VALUE_SHORT_NOTSET ? EMS_VALUE_INT_NOTSET : (uint8_t)((dew + 5) / 10);
data[7] = remotehum_[hc]; data[7] = remotehum_[hc];
data[8] = (uint8_t)(dew << 8); data[8] = (uint8_t)(dew << 8);
data[9] = (uint8_t)(dew & 0xFF); data[9] = (uint8_t)(dew & 0xFF);
@@ -272,12 +278,15 @@ void Roomctrl::nack_write() {
EMSuart::transmit(data, 1); EMSuart::transmit(data, 1);
} }
uint16_t Roomctrl::calc_dew(uint16_t temp, uint8_t humi) { int16_t Roomctrl::calc_dew(int16_t temp, uint8_t humi) {
if (humi == EMS_VALUE_UINT_NOTSET || temp == EMS_VALUE_SHORT_NOTSET) {
return EMS_VALUE_SHORT_NOTSET;
}
const float k2 = 17.62; const float k2 = 17.62;
const float k3 = 243.12; const float k3 = 243.12;
const float t = (float)temp / 10; const float t = (float)temp / 10;
const float h = (float)humi / 100; const float h = (float)humi / 100;
uint16_t dt = (10 * k3 * (((k2 * t) / (k3 + t)) + log(h)) / (((k2 * k3) / (k3 + t)) - log(h))); int16_t dt = (10 * k3 * (((k2 * t) / (k3 + t)) + log(h)) / (((k2 * k3) / (k3 + t)) - log(h)));
return dt; return dt;
} }

16
src/roomcontrol.h
View File

@@ -35,14 +35,14 @@ class Roomctrl {
static constexpr uint32_t SEND_INTERVAL = 60000; // 1 minute static constexpr uint32_t SEND_INTERVAL = 60000; // 1 minute
static constexpr uint8_t HCS = 4; // max 4 heating circuits static constexpr uint8_t HCS = 4; // max 4 heating circuits
static uint8_t get_hc(const uint8_t addr); static uint8_t get_hc(const uint8_t addr);
static void version(uint8_t addr, uint8_t dst); static void version(uint8_t addr, uint8_t dst);
static void unknown(uint8_t addr, uint8_t dst, uint8_t type, uint8_t offset); static void unknown(uint8_t addr, uint8_t dst, uint8_t type, uint8_t offset);
static void unknown(uint8_t addr, uint8_t dst, uint8_t offset, uint8_t typeh, uint8_t typel); static void unknown(uint8_t addr, uint8_t dst, uint8_t offset, uint8_t typeh, uint8_t typel);
static void temperature(uint8_t addr, uint8_t dst, uint8_t hc); static void temperature(uint8_t addr, uint8_t dst, uint8_t hc);
static void humidity(uint8_t addr, uint8_t dst, uint8_t hc); static void humidity(uint8_t addr, uint8_t dst, uint8_t hc);
static void nack_write(); static void nack_write();
static uint16_t calc_dew(uint16_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 rc_time_[HCS];

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.3-dev.2c" #define EMSESP_APP_VERSION "3.6.3-dev.2d"