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

testing MQTT hc

Browse Source
This commit is contained in:
proddy
2020-09-02 23:16:20 +02:00
parent e1df59911f
commit 66d105f99f
4 changed files with 141 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_standalone/ESP8266React.h
View File

@@ -24,7 +24,7 @@ class DummySettings {
bool shower_alert = false; bool shower_alert = false;
bool hide_led = false; bool hide_led = false;
uint16_t publish_time = 10; // seconds uint16_t publish_time = 10; // seconds
uint8_t mqtt_format = 1; // 1=single, 2=nested, 3=ha, 4=custom uint8_t mqtt_format = 3; // 1=single, 2=nested, 3=ha, 4=custom
uint8_t mqtt_qos = 0; uint8_t mqtt_qos = 0;
String hostname = "ems-esp"; String hostname = "ems-esp";
String jwtSecret = "ems-esp"; String jwtSecret = "ems-esp";

234
src/devices/thermostat.cpp
View File

@@ -269,8 +269,7 @@ void Thermostat::publish_values() {
return; return;
} }
uint8_t flags = this->model(); uint8_t flags = this->model();
bool has_data = false;
StaticJsonDocument<EMSESP_MAX_JSON_SIZE_MEDIUM> doc; StaticJsonDocument<EMSESP_MAX_JSON_SIZE_MEDIUM> doc;
JsonObject rootThermostat = doc.to<JsonObject>(); JsonObject rootThermostat = doc.to<JsonObject>();
@@ -324,132 +323,133 @@ void Thermostat::publish_values() {
} }
// go through all the heating circuits // go through all the heating circuits
bool has_data = false;
for (const auto & hc : heating_circuits_) { for (const auto & hc : heating_circuits_) {
if (!Helpers::hasValue(hc->setpoint_roomTemp)) { if (hc->is_active()) {
break; // skip this HC has_data = true;
}
has_data = true; // if the MQTT format is 'nested' or 'ha' then create the parent object hc<n>
// if the MQTT format is 'nested' or 'ha' then create the parent object hc<n> // if (mqtt_format_ != MQTT_format::SINGLE) {
// if (mqtt_format_ != MQTT_format::SINGLE) { if ((mqtt_format_ == MQTT_format::NESTED) || (mqtt_format_ == MQTT_format::HA)) {
if ((mqtt_format_ == MQTT_format::NESTED) || (mqtt_format_ == MQTT_format::HA)) { char hc_name[10]; // hc{1-4}
char hc_name[10]; // hc{1-4} strlcpy(hc_name, "hc", 10);
strlcpy(hc_name, "hc", 10); char s[3];
char s[3]; strlcat(hc_name, Helpers::itoa(s, hc->hc_num()), 10);
strlcat(hc_name, Helpers::itoa(s, hc->hc_num()), 10); dataThermostat = rootThermostat.createNestedObject(hc_name);
dataThermostat = rootThermostat.createNestedObject(hc_name);
} else {
dataThermostat = rootThermostat;
}
// different logic on how temperature values are stored, depending on model
uint8_t setpoint_temp_divider;
uint8_t curr_temp_divider;
if (flags == EMS_DEVICE_FLAG_EASY) {
setpoint_temp_divider = 100;
curr_temp_divider = 100;
} else if (flags == EMS_DEVICE_FLAG_JUNKERS) {
setpoint_temp_divider = 10;
curr_temp_divider = 10;
} else {
setpoint_temp_divider = 2;
curr_temp_divider = 10;
}
if (Helpers::hasValue(hc->setpoint_roomTemp)) {
dataThermostat["seltemp"] = Helpers::round2((float)hc->setpoint_roomTemp / setpoint_temp_divider);
}
if (Helpers::hasValue(hc->curr_roomTemp)) {
dataThermostat["currtemp"] = Helpers::round2((float)hc->curr_roomTemp / curr_temp_divider);
}
if (Helpers::hasValue(hc->daytemp)) {
if (flags == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
dataThermostat["heattemp"] = (float)hc->daytemp / 2;
} else { } else {
dataThermostat["daytemp"] = (float)hc->daytemp / 2; dataThermostat = rootThermostat;
} }
}
if (Helpers::hasValue(hc->nighttemp)) { // different logic on how temperature values are stored, depending on model
if (flags == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) { uint8_t setpoint_temp_divider;
dataThermostat["ecotemp"] = (float)hc->nighttemp / 2; uint8_t curr_temp_divider;
if (flags == EMS_DEVICE_FLAG_EASY) {
setpoint_temp_divider = 100;
curr_temp_divider = 100;
} else if (flags == EMS_DEVICE_FLAG_JUNKERS) {
setpoint_temp_divider = 10;
curr_temp_divider = 10;
} else { } else {
dataThermostat["nighttemp"] = (float)hc->nighttemp / 2; setpoint_temp_divider = 2;
curr_temp_divider = 10;
} }
}
if (Helpers::hasValue(hc->holidaytemp)) {
dataThermostat["holidaytemp"] = (float)hc->holidaytemp / 2;
}
if (Helpers::hasValue(hc->nofrosttemp)) { if (Helpers::hasValue(hc->setpoint_roomTemp)) {
dataThermostat["nofrosttemp"] = (float)hc->nofrosttemp / 2; dataThermostat["seltemp"] = Helpers::round2((float)hc->setpoint_roomTemp / setpoint_temp_divider);
} }
if (Helpers::hasValue(hc->heatingtype)) { if (Helpers::hasValue(hc->curr_roomTemp)) {
dataThermostat["heatingtype"] = hc->heatingtype; dataThermostat["currtemp"] = Helpers::round2((float)hc->curr_roomTemp / curr_temp_divider);
} }
if (Helpers::hasValue(hc->targetflowtemp)) { if (Helpers::hasValue(hc->daytemp)) {
dataThermostat["targetflowtemp"] = hc->targetflowtemp; if (flags == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
} dataThermostat["heattemp"] = (float)hc->daytemp / 2;
if (Helpers::hasValue(hc->offsettemp)) {
dataThermostat["offsettemp"] = hc->offsettemp / 2;
}
if (Helpers::hasValue(hc->designtemp)) {
dataThermostat["designtemp"] = hc->designtemp;
}
if (Helpers::hasValue(hc->summertemp)) {
dataThermostat["summertemp"] = hc->summertemp;
}
// when using HA always send the mode otherwise it'll may break the component/widget and report an error
if ((Helpers::hasValue(hc->mode)) || (mqtt_format_ == MQTT_format::HA)) {
uint8_t hc_mode = hc->get_mode(flags);
// if we're sending to HA the only valid mode types are heat, auto and off
if (mqtt_format_ == MQTT_format::HA) {
if ((hc_mode == HeatingCircuit::Mode::MANUAL) || (hc_mode == HeatingCircuit::Mode::DAY)) {
hc_mode = HeatingCircuit::Mode::HEAT;
} else if ((hc_mode == HeatingCircuit::Mode::NIGHT) || (hc_mode == HeatingCircuit::Mode::OFF)) {
hc_mode = HeatingCircuit::Mode::OFF;
} else { } else {
hc_mode = HeatingCircuit::Mode::AUTO; dataThermostat["daytemp"] = (float)hc->daytemp / 2;
} }
} }
dataThermostat["mode"] = mode_tostring(hc_mode); if (Helpers::hasValue(hc->nighttemp)) {
} if (flags == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
dataThermostat["ecotemp"] = (float)hc->nighttemp / 2;
// special handling of mode type, for the RC35 replace with summer/holiday if set } else {
// https://github.com/proddy/EMS-ESP/issues/373#issuecomment-619810209 dataThermostat["nighttemp"] = (float)hc->nighttemp / 2;
if (Helpers::hasValue(hc->summer_mode) && hc->summer_mode) { }
dataThermostat["modetype"] = F("summer"); }
} else if (Helpers::hasValue(hc->holiday_mode) && hc->holiday_mode) { if (Helpers::hasValue(hc->holidaytemp)) {
dataThermostat["modetype"] = F("holiday"); dataThermostat["holidaytemp"] = (float)hc->holidaytemp / 2;
} else if (Helpers::hasValue(hc->mode_type)) { }
dataThermostat["modetype"] = mode_tostring(hc->get_mode_type(flags));
} if (Helpers::hasValue(hc->nofrosttemp)) {
dataThermostat["nofrosttemp"] = (float)hc->nofrosttemp / 2;
// if format is single, send immediately and clear object for next hc }
// the topic will have the hc number appended
// if (mqtt_format_ == MQTT_format::SINGLE) { if (Helpers::hasValue(hc->heatingtype)) {
if ((mqtt_format_ == MQTT_format::SINGLE) || (mqtt_format_ == MQTT_format::CUSTOM)) { dataThermostat["heatingtype"] = hc->heatingtype;
char topic[30]; }
char s[3];
strlcpy(topic, "thermostat_data", 30); if (Helpers::hasValue(hc->targetflowtemp)) {
strlcat(topic, Helpers::itoa(s, hc->hc_num()), 30); // append hc to topic dataThermostat["targetflowtemp"] = hc->targetflowtemp;
Mqtt::publish(topic, doc); }
rootThermostat = doc.to<JsonObject>(); // clear object
} else if (mqtt_format_ == MQTT_format::HA) { if (Helpers::hasValue(hc->offsettemp)) {
// see if we have already registered this with HA MQTT Discovery, if not send the config dataThermostat["offsettemp"] = hc->offsettemp / 2;
if (!hc->ha_registered()) { }
register_mqtt_ha_config(hc->hc_num());
if (Helpers::hasValue(hc->designtemp)) {
dataThermostat["designtemp"] = hc->designtemp;
}
if (Helpers::hasValue(hc->summertemp)) {
dataThermostat["summertemp"] = hc->summertemp;
}
// when using HA always send the mode otherwise it'll may break the component/widget and report an error
if ((Helpers::hasValue(hc->mode)) || (mqtt_format_ == MQTT_format::HA)) {
uint8_t hc_mode = hc->get_mode(flags);
// if we're sending to HA the only valid mode types are heat, auto and off
if (mqtt_format_ == MQTT_format::HA) {
if ((hc_mode == HeatingCircuit::Mode::MANUAL) || (hc_mode == HeatingCircuit::Mode::DAY)) {
hc_mode = HeatingCircuit::Mode::HEAT;
} else if ((hc_mode == HeatingCircuit::Mode::NIGHT) || (hc_mode == HeatingCircuit::Mode::OFF)) {
hc_mode = HeatingCircuit::Mode::OFF;
} else {
hc_mode = HeatingCircuit::Mode::AUTO;
}
}
dataThermostat["mode"] = mode_tostring(hc_mode);
}
// special handling of mode type, for the RC35 replace with summer/holiday if set
// https://github.com/proddy/EMS-ESP/issues/373#issuecomment-619810209
if (Helpers::hasValue(hc->summer_mode) && hc->summer_mode) {
dataThermostat["modetype"] = F("summer");
} else if (Helpers::hasValue(hc->holiday_mode) && hc->holiday_mode) {
dataThermostat["modetype"] = F("holiday");
} else if (Helpers::hasValue(hc->mode_type)) {
dataThermostat["modetype"] = mode_tostring(hc->get_mode_type(flags));
}
// if format is single, send immediately and clear object for next hc
// the topic will have the hc number appended
// if (mqtt_format_ == MQTT_format::SINGLE) {
if ((mqtt_format_ == MQTT_format::SINGLE) || (mqtt_format_ == MQTT_format::CUSTOM)) {
char topic[30];
char s[3];
strlcpy(topic, "thermostat_data", 30);
strlcat(topic, Helpers::itoa(s, hc->hc_num()), 30); // append hc to topic
Mqtt::publish(topic, doc);
rootThermostat = doc.to<JsonObject>(); // clear object
} else if (mqtt_format_ == MQTT_format::HA) {
// see if we have already registered this with HA MQTT Discovery, if not send the config
if (!hc->ha_registered()) {
register_mqtt_ha_config(hc->hc_num());
hc->ha_registered(true);
}
// send the thermostat topic and payload data
std::string topic(100, '\0');
snprintf_P(&topic[0], topic.capacity() + 1, PSTR("homeassistant/climate/ems-esp/hc%d/state"), hc->hc_num());
Mqtt::publish(topic, doc);
} }
// send the thermostat topic and payload data
std::string topic(100, '\0');
snprintf_P(&topic[0], topic.capacity() + 1, PSTR("homeassistant/climate/ems-esp/hc%d/state"), hc->hc_num());
Mqtt::publish(topic, doc);
} }
} }
@@ -458,7 +458,6 @@ void Thermostat::publish_values() {
} }
// if we're using nested json, send all in one go under one topic called thermostat_data // if we're using nested json, send all in one go under one topic called thermostat_data
// if ((mqtt_format_ == MQTT_format::NESTED) || (mqtt_format_ == MQTT_format::CUSTOM)) {
if (mqtt_format_ == MQTT_format::NESTED) { if (mqtt_format_ == MQTT_format::NESTED) {
Mqtt::publish("thermostat_data", doc); Mqtt::publish("thermostat_data", doc);
} }
@@ -824,9 +823,10 @@ void Thermostat::show_values(uuid::console::Shell & shell) {
} }
for (const auto & hc : heating_circuits_) { for (const auto & hc : heating_circuits_) {
if (!Helpers::hasValue(hc->setpoint_roomTemp)) { if (!hc->is_active()) {
break; // skip this HC break; // skip this HC
} }
shell.printfln(F(" Heating Circuit %d:"), hc->hc_num()); shell.printfln(F(" Heating Circuit %d:"), hc->hc_num());
// different thermostat types store their temperature values differently // different thermostat types store their temperature values differently

11
src/devices/thermostat.h
View File

@@ -70,6 +70,15 @@ class Thermostat : public EMSdevice {
return ha_registered_; return ha_registered_;
} }
void ha_registered(bool b) {
ha_registered_ = b;
}
// determines if the heating circuit is actually present and has data
bool is_active() {
return Helpers::hasValue(setpoint_roomTemp);
}
uint8_t get_mode(uint8_t flags) const; uint8_t get_mode(uint8_t flags) const;
uint8_t get_mode_type(uint8_t flags) const; uint8_t get_mode_type(uint8_t flags) const;
@@ -275,7 +284,7 @@ class Thermostat : public EMSdevice {
void set_display(const char * value, const int8_t id); void set_display(const char * value, const int8_t id);
void set_building(const char * value, const int8_t id); void set_building(const char * value, const int8_t id);
void set_language(const char * value, const int8_t id); void set_language(const char * value, const int8_t id);
}; }; // namespace emsesp
} // namespace emsesp } // namespace emsesp

19
src/test/test.cpp
View File

@@ -28,7 +28,7 @@ namespace emsesp {
// used with the 'test' command, under su/admin // used with the 'test' command, under su/admin
void Test::run_test(uuid::console::Shell & shell, const std::string & command) { void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
if (command == "default") { if (command == "default") {
run_test(shell, "mqtt"); // add the default test case here run_test(shell, "thermostat"); // add the default test case here
} }
if (command.empty()) { if (command.empty()) {
@@ -223,11 +223,18 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
// EMSESP::add_device(0x08, 123, version, EMSdevice::Brand::BUDERUS); // Nefit Trendline // EMSESP::add_device(0x08, 123, version, EMSdevice::Brand::BUDERUS); // Nefit Trendline
// add a thermostat // add a thermostat
EMSESP::add_device(0x18, 157, version, EMSdevice::Brand::BOSCH); // Bosch CR100 - https://github.com/proddy/EMS-ESP/issues/355 EMSESP::add_device(0x10, 192, version, EMSdevice::Brand::JUNKERS); // FW120
// RCPLUSStatusMessage_HC1(0x01A5) // HC1
uart_telegram({0x98, 0x00, 0xFF, 0x00, 0x01, 0xA5, 0x00, 0xCF, 0x21, 0x2E, 0x00, 0x00, 0x2E, 0x24, uart_telegram({0x90, 0x00, 0xFF, 0x00, 0x00, 0x6F, 0x00, 0xCF, 0x21, 0x2E, 0x20, 0x00, 0x2E, 0x24,
0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03}); 0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
// HC2
uart_telegram({0x90, 0x00, 0xFF, 0x00, 0x00, 0x70, 0x00, 0xCF, 0x22, 0x2F, 0x10, 0x00, 0x2E, 0x24,
0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
// HC3
uart_telegram({0x90, 0x00, 0xFF, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
} }
if (command == "tc100") { if (command == "tc100") {
@@ -243,7 +250,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
// 0x0A // 0x0A
uart_telegram({0x98, 0x0B, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, uart_telegram({0x98, 0x0B, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
} }
if (command == "solar") { if (command == "solar") {
@@ -393,7 +400,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03}); 0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
uart_telegram("98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03"); // without CRC uart_telegram("98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03"); // without CRC
uart_telegram_withCRC("98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03 13"); // with CRC uart_telegram_withCRC("98 00 FF 00 01 A6 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03 6B"); // with CRC
EMSESP::txservice_.flush_tx_queue(); EMSESP::txservice_.flush_tx_queue();
shell.loop_all(); shell.loop_all();