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

prevent HA climate component being created if there is no current room temp - #582

Browse Source
This commit is contained in:
proddy
2020-11-17 21:54:09 +01:00
parent 52e120aea2
commit 45b55acc43
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/thermostat.cpp
View File

@@ -691,6 +691,8 @@ bool Thermostat::ha_config(bool force) {
if (!Mqtt::connected()) { if (!Mqtt::connected()) {
return false; return false;
} }
// if force, reset registered flag for main controller and all heating circuits
if (force) { if (force) {
for (const auto & hc : heating_circuits_) { for (const auto & hc : heating_circuits_) {
hc->ha_registered(false); hc->ha_registered(false);
@@ -698,16 +700,20 @@ bool Thermostat::ha_config(bool force) {
ha_registered(false); ha_registered(false);
} }
// set up the main controller
if (!ha_registered()) { if (!ha_registered()) {
register_mqtt_ha_config(); register_mqtt_ha_config();
ha_registered(true); ha_registered(true);
return false; return false;
} }
// check to see which heating circuits need publishing // check to see which heating circuits need to be added as HA climate components
// but only if it's active and there is a real value for the current room temperature (https://github.com/proddy/EMS-ESP/issues/582)
for (const auto & hc : heating_circuits_) { for (const auto & hc : heating_circuits_) {
if (hc->is_active() && !hc->ha_registered()) { if (hc->is_active() && !hc->ha_registered()) {
if (Helpers::hasValue(hc->curr_roomTemp)) {
register_mqtt_ha_config(hc->hc_num()); register_mqtt_ha_config(hc->hc_num());
}
hc->ha_registered(true); hc->ha_registered(true);
return false; return false;
} }
@@ -828,7 +834,7 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
} }
// publish config topic for HA MQTT Discovery for main thermostat values // publish config topic for HA MQTT Discovery for main thermostat values
// homeassistant/climate/ems-esp/thermostat/config // homeassistant/sensor/ems-esp/thermostat/config
void Thermostat::register_mqtt_ha_config() { void Thermostat::register_mqtt_ha_config() {
StaticJsonDocument<EMSESP_MAX_JSON_SIZE_SMALL> doc; StaticJsonDocument<EMSESP_MAX_JSON_SIZE_SMALL> doc;
doc["uniq_id"] = F("thermostat"); doc["uniq_id"] = F("thermostat");