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

publish_time optimizations

Browse Source
This commit is contained in:
Paul
2020-02-12 22:11:34 +01:00
parent 820cda1266
commit 1d251a52b3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ems-esp.cpp
View File

@@ -548,7 +548,7 @@ void scanDallas() {
// send all dallas sensor values as a JSON package to MQTT // send all dallas sensor values as a JSON package to MQTT
void publishSensorValues() { void publishSensorValues() {
// don't send if MQTT is connected // don't send if MQTT is connected
if (!myESP.isMQTTConnected()) { if (!myESP.isMQTTConnected() || (!EMSESP_Settings.publish_time)) {
return; return;
} }
@@ -584,7 +584,7 @@ void publishSensorValues() {
// a json object is created for each device type // a json object is created for each device type
void publishEMSValues(bool force) { void publishEMSValues(bool force) {
// don't send if MQTT is not connected or EMS bus is not connected // don't send if MQTT is not connected or EMS bus is not connected
if (!myESP.isMQTTConnected() || (!ems_getBusConnected())) { if (!myESP.isMQTTConnected() || (!ems_getBusConnected()) || (!EMSESP_Settings.publish_time)) {
return; return;
} }
@@ -918,6 +918,11 @@ bool do_publishShowerData() {
// call PublishValues with forcing forcing // call PublishValues with forcing forcing
void do_publishValues() { void do_publishValues() {
if (!EMSESP_Settings.publish_time) {
myDebugLog("publish_time is set to 0. Publishing disabled.");
return;
}
myDebugLog("Starting scheduled MQTT publish..."); myDebugLog("Starting scheduled MQTT publish...");
publishEMSValues(false); publishEMSValues(false);
publishSensorValues(); publishSensorValues();
@@ -1187,12 +1192,17 @@ bool SetListCallback(MYESP_FSACTION_t action, uint8_t wc, const char * setting,
myDebug_P(PSTR(" listen_mode=%s"), EMSESP_Settings.listen_mode ? "on" : "off"); myDebug_P(PSTR(" listen_mode=%s"), EMSESP_Settings.listen_mode ? "on" : "off");
myDebug_P(PSTR(" shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off"); myDebug_P(PSTR(" shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off");
myDebug_P(PSTR(" shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off"); myDebug_P(PSTR(" shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off");
myDebug_P(PSTR(" publish_time=%d"), EMSESP_Settings.publish_time);
if (EMSESP_Settings.publish_time) {
myDebug_P(PSTR(" publish_time=%d"), EMSESP_Settings.publish_time);
} else {
myDebug_P(PSTR(" publish_time=0 (no MQTT publishing)"));
}
if (EMSESP_Settings.master_thermostat) { if (EMSESP_Settings.master_thermostat) {
myDebug_P(PSTR(" master_thermostat=%d"), EMSESP_Settings.master_thermostat); myDebug_P(PSTR(" master_thermostat=%d"), EMSESP_Settings.master_thermostat);
} else { } else {
myDebug_P(PSTR(" master_thermostat=0 (using first one detected)"), EMSESP_Settings.master_thermostat); myDebug_P(PSTR(" master_thermostat=0 (using first one detected)"));
} }
} }