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

Fix #21: Display DC power in Live Data overview

Browse Source
This commit is contained in:
Thomas Basler 2022-07-07 19:05:50 +02:00
parent c89e729dea
commit c28087ec86
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/WebApi_ws_live.h
View File

@ -11,7 +11,7 @@ public:
private: private:
AsyncWebSocket* _ws; AsyncWebSocket* _ws;
void addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId); void addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic = "");
uint32_t _lastWsPublish = 0; uint32_t _lastWsPublish = 0;
uint32_t _lastInvUpdateCheck = 0; uint32_t _lastInvUpdateCheck = 0;

16
src/WebApi_ws_live.cpp
View File

@ -50,7 +50,11 @@ void WebApiWsLiveClass::loop()
for (uint8_t c = 0; c <= inv->getChannelCount(); c++) { for (uint8_t c = 0; c <= inv->getChannelCount(); c++) {
addField(root, i, inv, c, FLD_UDC); addField(root, i, inv, c, FLD_UDC);
addField(root, i, inv, c, FLD_IDC); addField(root, i, inv, c, FLD_IDC);
if (c == 0) {
addField(root, i, inv, c, FLD_PDC, F("Power DC"));
} else {
addField(root, i, inv, c, FLD_PDC); addField(root, i, inv, c, FLD_PDC);
}
addField(root, i, inv, c, FLD_YD); addField(root, i, inv, c, FLD_YD);
addField(root, i, inv, c, FLD_YT); addField(root, i, inv, c, FLD_YT);
addField(root, i, inv, c, FLD_UAC); addField(root, i, inv, c, FLD_UAC);
@ -79,10 +83,16 @@ void WebApiWsLiveClass::loop()
} }
} }
void WebApiWsLiveClass::addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) void WebApiWsLiveClass::addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId, String topic)
{ {
if (inv->hasChannelFieldValue(channel, fieldId)) { if (inv->hasChannelFieldValue(channel, fieldId)) {
root[idx][String(channel)][inv->getChannelFieldName(channel, fieldId)]["v"] = inv->getChannelFieldValue(channel, fieldId); String chanName;
root[idx][String(channel)][inv->getChannelFieldName(channel, fieldId)]["u"] = inv->getChannelFieldUnit(channel, fieldId); if (topic == "") {
chanName = inv->getChannelFieldName(channel, fieldId);
} else {
chanName = topic;
}
root[idx][String(channel)][chanName]["v"] = inv->getChannelFieldValue(channel, fieldId);
root[idx][String(channel)][chanName]["u"] = inv->getChannelFieldUnit(channel, fieldId);
} }
} }