From 3212aeb1423a88fa3c49cbd397e5584812eaaabd Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 25 Aug 2022 09:59:21 +0200 Subject: [PATCH] code review: added check if mqtt is enabled before sending out values --- tools/esp8266/app.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 64923559..938a3e5a 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -376,21 +376,23 @@ void app::processPayload(bool retransmit) { iv->setQueuedCmdFinished(); - // send out - char topic[30], val[10]; - for (uint8_t id = 0; id < mSys->getNumInverters(); id++) - { - Inverter<> *iv = mSys->getInverterByPos(id); - if (NULL != iv) + // MQTT send out + if(mMqttActive) { + char topic[30], val[10]; + for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { - if (iv->isAvailable(mTimestamp)) + Inverter<> *iv = mSys->getInverterByPos(id); + if (NULL != iv) { - for (uint8_t i = 0; i < iv->listLen; i++) + if (iv->isAvailable(mTimestamp)) { - snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]); - snprintf(val, 10, "%.3f", iv->getValue(i)); - mMqtt.sendMsg(topic, val); - yield(); + for (uint8_t i = 0; i < iv->listLen; i++) + { + snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]); + snprintf(val, 10, "%.3f", iv->getValue(i)); + mMqtt.sendMsg(topic, val); + yield(); + } } } } @@ -968,4 +970,4 @@ void app::resetPayload(Inverter<>* iv) mPayload[iv->id].complete = false; mPayload[iv->id].requested = true; mPayload[iv->id].ts = mTimestamp; -} \ No newline at end of file +}