patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify MqttPublishing

Browse Source 
* Moved all fields to an array
* Moved target topic generation to separate method
This commit is contained in:
Thomas Basler 2022-07-18 19:13:58 +02:00
parent bb52d24c25
commit db0e0c67ce
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/MqttPublishing.h
View File

@ -12,10 +12,27 @@ public:
void loop(); void loop();
private: private:
void publishField(String subtopic, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic = ""); void publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId);
String getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId);
uint32_t _lastPublishStats[INV_MAX_COUNT]; uint32_t _lastPublishStats[INV_MAX_COUNT];
uint32_t _lastPublish; uint32_t _lastPublish;
uint8_t _publishFields[13] = {
FLD_UDC,
FLD_IDC,
FLD_PDC,
FLD_YD,
FLD_YT,
FLD_UAC,
FLD_IAC,
FLD_PAC,
FLD_F,
FLD_T,
FLD_PCT,
FLD_EFF,
FLD_IRR
};
}; };
extern MqttPublishingClass MqttPublishing; extern MqttPublishingClass MqttPublishing;

57
src/MqttPublishing.cpp
View File

@ -41,23 +41,9 @@ void MqttPublishingClass::loop()
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) {
publishField(subtopic, inv, c, FLD_UDC); for (uint8_t f = 0; f < sizeof(_publishFields); f++) {
publishField(subtopic, inv, c, FLD_IDC); publishField(inv, c, _publishFields[f]);
if (c == 0) {
publishField(subtopic, inv, c, FLD_PDC, "powerdc");
} else {
publishField(subtopic, inv, c, FLD_PDC);
} }
publishField(subtopic, inv, c, FLD_YD);
publishField(subtopic, inv, c, FLD_YT);
publishField(subtopic, inv, c, FLD_UAC);
publishField(subtopic, inv, c, FLD_IAC);
publishField(subtopic, inv, c, FLD_PAC);
publishField(subtopic, inv, c, FLD_F);
publishField(subtopic, inv, c, FLD_T);
publishField(subtopic, inv, c, FLD_PCT);
publishField(subtopic, inv, c, FLD_EFF);
publishField(subtopic, inv, c, FLD_IRR);
} }
} }
@ -68,16 +54,35 @@ void MqttPublishingClass::loop()
} }
} }
void MqttPublishingClass::publishField(String subtopic, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic) void MqttPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{ {
if (inv->Statistics()->hasChannelFieldValue(channel, fieldId)) { String topic = getTopic(inv, channel, fieldId);
String chanName; if (topic == "") {
if (topic == "") { return;
chanName = inv->Statistics()->getChannelFieldName(channel, fieldId);
} else {
chanName = topic;
}
chanName.toLowerCase();
MqttSettings.publish(subtopic + "/" + String(channel) + "/" + chanName, String(inv->Statistics()->getChannelFieldValue(channel, fieldId)));
} }
MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(channel, fieldId)));
}
String MqttPublishingClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{
if (!inv->Statistics()->hasChannelFieldValue(channel, fieldId)) {
return String("");
}
char buffer[sizeof(uint64_t) * 8 + 1];
sprintf(buffer, "%0lx%08lx",
((uint32_t)((inv->serial() >> 32) & 0xFFFFFFFF)),
((uint32_t)(inv->serial() & 0xFFFFFFFF)));
String invSerial = String(buffer);
String chanName;
if (channel == 0 && fieldId == FLD_PDC) {
chanName = "powerdc";
} else {
chanName = inv->Statistics()->getChannelFieldName(channel, fieldId);
chanName.toLowerCase();
}
return invSerial + "/" + String(channel) + "/" + chanName;
} }