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

SRC thermostat test, update1

Browse Source
This commit is contained in:
MichaelDvP
2025-09-30 08:48:56 +02:00
parent 59d07e81d6
commit d88513d789
3 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/locale_common.h
View File

@@ -339,6 +339,7 @@ MAKE_ENUM(enum_mode4, FL_(nofrost), FL_(eco), FL_(heat), FL_(auto)) // JUNKERS
MAKE_ENUM(enum_mode5, FL_(auto), FL_(off)) // CRF MAKE_ENUM(enum_mode5, FL_(auto), FL_(off)) // CRF
MAKE_ENUM(enum_mode6, FL_(nofrost), FL_(night), FL_(day)) // RC10 MAKE_ENUM(enum_mode6, FL_(nofrost), FL_(night), FL_(day)) // RC10
MAKE_ENUM(enum_mode7, FL_(off), FL_(manual)) // CR11 MAKE_ENUM(enum_mode7, FL_(off), FL_(manual)) // CR11
MAKE_ENUM(enum_mode8, FL_(auto), FL_(heat), FL_(cool), FL_(off)) // SRC room thermostats
MAKE_ENUM(enum_mode_ha, FL_(off), FL_(heat), FL_(auto)) // HA climate MAKE_ENUM(enum_mode_ha, FL_(off), FL_(heat), FL_(auto)) // HA climate
MAKE_ENUM(enum_modetype, FL_(eco), FL_(comfort)) MAKE_ENUM(enum_modetype, FL_(eco), FL_(comfort))

64
src/devices/connect.cpp
View File

@@ -37,10 +37,8 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
register_telegram_type(0x0BDD + i, "Room", false, MAKE_PF_CB(process_roomThermostat)); register_telegram_type(0x0BDD + i, "Room", false, MAKE_PF_CB(process_roomThermostat));
register_telegram_type(0x0B3D + i, "Roomname", true, MAKE_PF_CB(process_roomThermostatName)); register_telegram_type(0x0B3D + i, "Roomname", true, MAKE_PF_CB(process_roomThermostatName));
register_telegram_type(0x0BB5 + i, "Roomsettings", true, MAKE_PF_CB(process_roomThermostatMode)); register_telegram_type(0x0BB5 + i, "Roomsettings", true, MAKE_PF_CB(process_roomThermostatMode));
register_telegram_type(0x1230 + i, "Roomparams", true, MAKE_PF_CB(process_roomThermostatParam));
// 1230..123F read, unknown, 16 bytes long? register_telegram_type(0x1244 + i, "Roomdata", false, MAKE_PF_CB(process_roomThermostatData));
// register_telegram_type(0x1230 + i, "unknown", true, MAKE_PF_CB(process_unknown));
// 1244..1253 broadcast, unknown, 14 bytes long
} }
// register_telegram_type(0xDB65, "Roomschedule", true, MAKE_PF_CB(process_roomSchedule)); // register_telegram_type(0xDB65, "Roomschedule", true, MAKE_PF_CB(process_roomSchedule));
// 0x2040, broadcast 36 bytes: // 0x2040, broadcast 36 bytes:
@@ -63,9 +61,11 @@ void Connect::process_OutdoorTemp(std::shared_ptr<const Telegram> telegram) {
void Connect::register_device_values_room(std::shared_ptr<Connect::RoomCircuit> room) { void Connect::register_device_values_room(std::shared_ptr<Connect::RoomCircuit> room) {
auto tag = DeviceValueTAG::TAG_HS1 + room->room(); auto tag = DeviceValueTAG::TAG_HS1 + room->room();
register_device_value(tag, &room->temp_, DeviceValueType::INT16, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(roomTemp), DeviceValueUOM::DEGREES); register_device_value(tag, &room->temp_, DeviceValueType::INT16, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(roomTemp), DeviceValueUOM::DEGREES);
register_device_value(tag, &room->humidity_, DeviceValueType::UINT8, FL_(airHumidity), DeviceValueUOM::PERCENT); register_device_value(tag, &room->humidity_, DeviceValueType::INT8, FL_(airHumidity), DeviceValueUOM::PERCENT);
register_device_value(tag, &room->seltemp_, DeviceValueType::UINT8, DeviceValueNumOp::DV_NUMOP_DIV2, FL_(seltemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_seltemp)); register_device_value(tag, &room->dewtemp_, DeviceValueType::INT16, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(dewTemperature), DeviceValueUOM::DEGREES);
register_device_value(tag, &room->mode_, DeviceValueType::ENUM, FL_(enum_mode2), FL_(mode), DeviceValueUOM::NONE, MAKE_CF_CB(set_mode)); register_device_value(
tag, &room->seltemp_, DeviceValueType::UINT8, DeviceValueNumOp::DV_NUMOP_DIV2, FL_(seltemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_seltemp));
register_device_value(tag, &room->mode_, DeviceValueType::ENUM, FL_(enum_mode8), FL_(mode), DeviceValueUOM::NONE, MAKE_CF_CB(set_mode));
register_device_value(tag, &room->name_, DeviceValueType::STRING, FL_(name), DeviceValueUOM::NONE, MAKE_CF_CB(set_name)); register_device_value(tag, &room->name_, DeviceValueType::STRING, FL_(name), DeviceValueUOM::NONE, MAKE_CF_CB(set_name));
} }
@@ -90,16 +90,22 @@ std::shared_ptr<Connect::RoomCircuit> Connect::room_circuit(const uint8_t num, c
// gateway(0x50) B all(0x00), ?(0x0BDD), data: 00 E6 36 2A // gateway(0x50) B all(0x00), ?(0x0BDD), data: 00 E6 36 2A
void Connect::process_roomThermostat(std::shared_ptr<const Telegram> telegram) { void Connect::process_roomThermostat(std::shared_ptr<const Telegram> telegram) {
auto rc = room_circuit(telegram->type_id - 0xBDD, true); bool create = telegram->offset == 0 && telegram->message_data[0] < 0x80;
uint8_t humidity = EMS_VALUE_UINT8_NOTSET; auto rc = room_circuit(telegram->type_id - 0xBDD, create);
uint8_t seltemp = EMS_VALUE_UINT8_NOTSET; if (rc == nullptr) {
has_update(telegram, rc->temp_, 0); return;
if (Helpers::hasValue(rc->temp_)) {
telegram->read_value(humidity, 2);
telegram->read_value(seltemp, 3);
} }
has_update(rc->humidity_, humidity); has_update(telegram, rc->temp_, 0);
has_update(rc->seltemp_, seltemp); has_update(telegram, rc->humidity_, 2); // could show -3 if not set
has_update(telegram, rc->seltemp_, 3);
// calculate dew temperature
const float k2 = 17.62;
const float k3 = 243.12;
const float t = (float)rc->temp_ / 10;
const float h = (float)rc->humidity_ / 100;
int16_t dt = (10 * k3 * (((k2 * t) / (k3 + t)) + log(h)) / (((k2 * k3) / (k3 + t)) - log(h)));
has_update(rc->dewtemp_, dt);
} }
// gateway(0x48) W gateway(0x50), ?(0x0B42), data: 01 // gateway(0x48) W gateway(0x50), ?(0x0B42), data: 01
@@ -113,14 +119,11 @@ void Connect::process_roomThermostatName(std::shared_ptr<const Telegram> telegra
return; return;
} }
std::string s; std::string s;
char c; for (uint8_t i = 2 - telegram->offset; (i < telegram->message_length) && (telegram->message_data[i] != 0); i += 2) {
uint8_t i = 3 - telegram->offset; s += (char)telegram->message_data[i];
while ((i < telegram->message_length) && ((c = telegram->message_data[i]) != 0)) {
s += c;
i += 2;
} }
if (s.length()) { if (s.length()) {
has_update(rc->name_, s.c_str(), s.length()); has_update(rc->name_, s.c_str(), s.length() + 1);
} }
} }
@@ -130,7 +133,14 @@ void Connect::process_roomThermostatMode(std::shared_ptr<const Telegram> telegra
if (rc == nullptr) { if (rc == nullptr) {
return; return;
} }
has_enumupdate(telegram, rc->mode_, 0, {3, 1, 0}); // has_enumupdate(telegram, rc->mode_, 0, {3, 1, 0});
has_update(telegram, rc->mode_, 0);
}
void Connect::process_roomThermostatParam(std::shared_ptr<const Telegram> telegram) {
}
void Connect::process_roomThermostatData(std::shared_ptr<const Telegram> telegram) {
} }
// Settings: // Settings:
@@ -141,7 +151,8 @@ bool Connect::set_mode(const char * value, const int8_t id) {
return false; return false;
} }
uint8_t v; uint8_t v;
if (Helpers::value2enum(value, v, FL_(enum_mode2), {3, 1, 0})) { // if (Helpers::value2enum(value, v, FL_(enum_mode2), {3, 1, 0})) {
if (Helpers::value2enum(value, v, FL_(enum_mode8))) {
write_command(0xBB5 + rc->room(), 0, v); // no validate, mode change is broadcasted write_command(0xBB5 + rc->room(), 0, v); // no validate, mode change is broadcasted
return true; return true;
} }
@@ -155,7 +166,8 @@ bool Connect::set_seltemp(const char * value, const int8_t id) {
} }
float v; float v;
if (Helpers::value2float(value, v)) { if (Helpers::value2float(value, v)) {
write_command(0xBB5 + rc->room(), rc->mode_ == 2 ? 1 : 3, v * 2); // write_command(0xBB5 + rc->room(), rc->mode_ == 2 ? 1 : 3, v == -1 ? 0xFF : uint8_t(v * 2));
write_command(0xBB5 + rc->room(), rc->mode_ == 0 ? 1 : 3, v == -1 ? 0xFF : uint8_t(v * 2));
return true; return true;
} }
return false; return false;
@@ -166,7 +178,7 @@ bool Connect::set_name(const char * value, const int8_t id) {
if (rc == nullptr || value == nullptr || strlen(value) > 12) { if (rc == nullptr || value == nullptr || strlen(value) > 12) {
return false; return false;
} }
uint8_t data[strlen(value) * 2]; uint8_t data[strlen(value) * 2];
uint8_t * d = data; uint8_t * d = data;
const char * c = value; const char * c = value;
while (*c != 0) { while (*c != 0) {

15
src/devices/connect.h
View File

@@ -33,13 +33,14 @@ class Connect : public EMSdevice {
: room_(num) { : room_(num) {
} }
~RoomCircuit() = default; ~RoomCircuit() = default;
int16_t temp_; int16_t temp_;
uint8_t humidity_; int8_t humidity_;
uint8_t seltemp_; uint8_t seltemp_;
uint8_t mode_; uint8_t mode_;
char name_[25]; char name_[25];
int16_t dewtemp_;
uint8_t room() { uint8_t room() {
return room_; return room_;
} }
@@ -54,6 +55,8 @@ class Connect : public EMSdevice {
void process_roomThermostat(std::shared_ptr<const Telegram> telegram); void process_roomThermostat(std::shared_ptr<const Telegram> telegram);
void process_roomThermostatName(std::shared_ptr<const Telegram> telegram); void process_roomThermostatName(std::shared_ptr<const Telegram> telegram);
void process_roomThermostatMode(std::shared_ptr<const Telegram> telegram); void process_roomThermostatMode(std::shared_ptr<const Telegram> telegram);
void process_roomThermostatParam(std::shared_ptr<const Telegram> telegram);
void process_roomThermostatData(std::shared_ptr<const Telegram> telegram);
bool set_mode(const char * value, const int8_t id); bool set_mode(const char * value, const int8_t id);
bool set_seltemp(const char * value, const int8_t id); bool set_seltemp(const char * value, const int8_t id);
bool set_name(const char * value, const int8_t id); bool set_name(const char * value, const int8_t id);