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

only publish MQTT if MQTT is enabled

Browse Source
This commit is contained in:
proddy
2020-10-03 16:31:34 +02:00
parent 84c5c3faa2
commit 644abdffb6
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/emsesp.cpp
View File

@@ -290,46 +290,46 @@ void EMSESP::show_sensor_values(uuid::console::Shell & shell) {
// MQTT publish everything, immediately // MQTT publish everything, immediately
void EMSESP::publish_all() { void EMSESP::publish_all() {
publish_device_values(EMSdevice::DeviceType::BOILER); if (Mqtt::connected()) {
publish_device_values(EMSdevice::DeviceType::THERMOSTAT); publish_device_values(EMSdevice::DeviceType::BOILER);
publish_device_values(EMSdevice::DeviceType::SOLAR); publish_device_values(EMSdevice::DeviceType::THERMOSTAT);
publish_device_values(EMSdevice::DeviceType::MIXING); publish_device_values(EMSdevice::DeviceType::SOLAR);
publish_other_values(); publish_device_values(EMSdevice::DeviceType::MIXING);
publish_sensor_values(true); publish_other_values();
system_.send_heartbeat(); publish_sensor_values(true);
system_.send_heartbeat();
}
} }
void EMSESP::publish_device_values(uint8_t device_type) { void EMSESP::publish_device_values(uint8_t device_type) {
if (Mqtt::connected()) { for (const auto & emsdevice : emsdevices) {
for (const auto & emsdevice : emsdevices) { if (emsdevice && (emsdevice->device_type() == device_type)) {
if (emsdevice && (emsdevice->device_type() == device_type)) { emsdevice->publish_values();
emsdevice->publish_values();
}
} }
} }
} }
void EMSESP::publish_other_values() { void EMSESP::publish_other_values() {
if (Mqtt::connected()) { for (const auto & emsdevice : emsdevices) {
for (const auto & emsdevice : emsdevices) { if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::BOILER) && (emsdevice->device_type() != EMSdevice::DeviceType::THERMOSTAT)
if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::BOILER) && (emsdevice->device_type() != EMSdevice::DeviceType::THERMOSTAT) && (emsdevice->device_type() != EMSdevice::DeviceType::SOLAR) && (emsdevice->device_type() != EMSdevice::DeviceType::MIXING)) {
&& (emsdevice->device_type() != EMSdevice::DeviceType::SOLAR) && (emsdevice->device_type() != EMSdevice::DeviceType::MIXING)) { emsdevice->publish_values();
emsdevice->publish_values();
}
} }
} }
} }
void EMSESP::publish_sensor_values(const bool force) { void EMSESP::publish_sensor_values(const bool force) {
if (Mqtt::connected()) { if (sensor_.updated_values() || force) {
if (sensor_.updated_values() || force) { sensor_.publish_values();
sensor_.publish_values();
}
} }
} }
// MQTT publish a telegram as raw data // MQTT publish a telegram as raw data
void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) { void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) {
if (!Mqtt::connected()) {
return;
}
StaticJsonDocument<EMSESP_MAX_JSON_SIZE_SMALL> doc; StaticJsonDocument<EMSESP_MAX_JSON_SIZE_SMALL> doc;
char buffer[100]; char buffer[100];
@@ -553,8 +553,8 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
if (emsdevice) { if (emsdevice) {
if (emsdevice->is_device_id(telegram->src)) { if (emsdevice->is_device_id(telegram->src)) {
found = emsdevice->handle_telegram(telegram); found = emsdevice->handle_telegram(telegram);
// check to see if we need to follow up after the telegram has been processed // if we correctly processes the telegram follow up with sending it via MQTT if needed
if (found) { if (found && Mqtt::connected()) {
if ((mqtt_.get_publish_onchange(emsdevice->device_type()) && emsdevice->updated_values()) || telegram->type_id == publish_id_) { if ((mqtt_.get_publish_onchange(emsdevice->device_type()) && emsdevice->updated_values()) || telegram->type_id == publish_id_) {
if (telegram->type_id == publish_id_) { if (telegram->type_id == publish_id_) {
publish_id_ = 0; publish_id_ = 0;