3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-01 11:16:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix #397 MQTT reports zero values

Browse source 
fix #397 remove "not producing" if not yet available for MQTT and HTML
This commit is contained in:
lumapu 2022-11-06 20:16:09 +01:00
parent 64fb587cf3
commit 11da974772
2 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
tools/esp8266/app.cpp
View file

@ -612,10 +612,10 @@ void app::sendMqtt(void) {
} }
snprintf(topic, 32 + MAX_NAME_LENGTH, "%s/available_text", iv->name); snprintf(topic, 32 + MAX_NAME_LENGTH, "%s/available_text", iv->name);
snprintf(val, 32, "%s%s%s%s", snprintf(val, 32, "%s%s%s%s",
(MQTT_STATUS_NOT_AVAIL_NOT_PROD) ? "not " : "", (MQTT_STATUS_NOT_AVAIL_NOT_PROD) ? "not yet " : "",
"available and ", "available and ",
(MQTT_STATUS_NOT_AVAIL_NOT_PROD || MQTT_STATUS_AVAIL_NOT_PROD) ? "not " : "", (MQTT_STATUS_AVAIL_NOT_PROD) ? "not " : "",
"producing" (MQTT_STATUS_NOT_AVAIL_NOT_PROD) ? "" : "producing"
); );
mMqtt.sendMsg(topic, val); mMqtt.sendMsg(topic, val);
@ -629,32 +629,34 @@ void app::sendMqtt(void) {
} }
// data // data
for (uint8_t i = 0; i < rec->length; i++) { if(iv->isAvailable(mUtcTimestamp, rec)) {
snprintf(topic, 32 + MAX_NAME_LENGTH, "%s/ch%d/%s", iv->name, rec->assign[i].ch, fields[rec->assign[i].fieldId]); for (uint8_t i = 0; i < rec->length; i++) {
snprintf(val, 10, "%.3f", iv->getValue(i, rec)); snprintf(topic, 32 + MAX_NAME_LENGTH, "%s/ch%d/%s", iv->name, rec->assign[i].ch, fields[rec->assign[i].fieldId]);
mMqtt.sendMsg(topic, val); snprintf(val, 10, "%.3f", iv->getValue(i, rec));
mMqtt.sendMsg(topic, val);
// calculate total values for RealTimeRunData_Debug // calculate total values for RealTimeRunData_Debug
if (mMqttSendList.front() == RealTimeRunData_Debug) { if (mMqttSendList.front() == RealTimeRunData_Debug) {
if (CH0 == rec->assign[i].ch) { if (CH0 == rec->assign[i].ch) {
switch (rec->assign[i].fieldId) { switch (rec->assign[i].fieldId) {
case FLD_PAC: case FLD_PAC:
total[0] += iv->getValue(i, rec); total[0] += iv->getValue(i, rec);
break; break;
case FLD_YT: case FLD_YT:
total[1] += iv->getValue(i, rec); total[1] += iv->getValue(i, rec);
break; break;
case FLD_YD: case FLD_YD:
total[2] += iv->getValue(i, rec); total[2] += iv->getValue(i, rec);
break; break;
case FLD_PDC: case FLD_PDC:
total[3] += iv->getValue(i, rec); total[3] += iv->getValue(i, rec);
break; break;
}
} }
sendTotal = true;
} }
sendTotal = true; yield();
} }
yield();
} }
} }

12
tools/esp8266/html/index.html
View file

@ -153,11 +153,13 @@
for(var i of obj) { for(var i of obj) {
html += "Inverter #" + i["id"] + ": " + i["name"] + " (v" + i["version"] + ") is "; html += "Inverter #" + i["id"] + ": " + i["name"] + " (v" + i["version"] + ") is ";
if(false == i["is_avail"]) if(false == i["is_avail"])
html += "not "; html += "not yet available";
html += "available and is "; else {
if(false == i["is_producing"]) html += "available and is ";
html += "not "; if(false == i["is_producing"])
html += "producing\n"; html += "not ";
html += "producing\n";
}
if(false == i["is_avail"]) { if(false == i["is_avail"]) {
if(i["ts_last_success"] > 0) { if(i["ts_last_success"] > 0) {