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

esnure heating and tap water mqtt messages are sent immediately

Browse Source
This commit is contained in:
Paul
2019-12-03 20:30:14 +01:00
parent b8a55a1f8c
commit c20c4998e9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ems-esp.cpp
View File

@@ -706,12 +706,12 @@ void publishEMSValues(bool force) {
// see if the heating or hot tap water has changed, if so send // see if the heating or hot tap water has changed, if so send
// last_boilerActive stores heating in bit 1 and tap water in bit 2 // last_boilerActive stores heating in bit 1 and tap water in bit 2
if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive)) || force) { if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) | EMS_Boiler.heatingActive)) || force) {
myDebugLog("Publishing hot water and heating states via MQTT"); myDebugLog("Publishing hot water and heating states via MQTT");
myESP.mqttPublish(TOPIC_BOILER_TAPWATER_ACTIVE, EMS_Boiler.tapwaterActive == 1 ? "1" : "0"); myESP.mqttPublish(TOPIC_BOILER_TAPWATER_ACTIVE, EMS_Boiler.tapwaterActive == 1 ? "1" : "0");
myESP.mqttPublish(TOPIC_BOILER_HEATING_ACTIVE, EMS_Boiler.heatingActive == 1 ? "1" : "0"); myESP.mqttPublish(TOPIC_BOILER_HEATING_ACTIVE, EMS_Boiler.heatingActive == 1 ? "1" : "0");
last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive); // remember last state last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) | EMS_Boiler.heatingActive); // remember last state
} }
// handle the thermostat values // handle the thermostat values
@@ -2030,13 +2030,8 @@ void loop() {
do_regularUpdates(); do_regularUpdates();
publishEMSValues(true); publishEMSValues(true);
publishSensorValues(true); publishSensorValues(true);
_need_first_publish = false; // reset flag _need_first_publish = false; // reset flag, so only do this once
} } else {
// publish all the values to MQTT
// but only if the values have changed and publish_time is on automatic mode
// always publish when we get the first results, regardless of any publish_time setting
if (EMSESP_Settings.publish_time == 0) {
publishEMSValues(false); publishEMSValues(false);
publishSensorValues(false); publishSensorValues(false);
} }

2
src/ems.cpp
View File

@@ -1272,6 +1272,8 @@ void _checkActive() {
if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET && EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET) { if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET && EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET) {
EMS_Boiler.heatingActive = ((EMS_Boiler.selFlowTemp >= EMS_BOILER_SELFLOWTEMP_HEATING) && (EMS_Boiler.burnGas == EMS_VALUE_INT_ON)); EMS_Boiler.heatingActive = ((EMS_Boiler.selFlowTemp >= EMS_BOILER_SELFLOWTEMP_HEATING) && (EMS_Boiler.burnGas == EMS_VALUE_INT_ON));
} }
EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
} }
/** /**