github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-08 06:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup and buffer sharing

Browse Source
This commit is contained in:
Gunnar Skjold
2022-02-22 21:05:34 +01:00
parent 6bded12ec5
commit cbbb52d32a
11 changed files with 49 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mqtt/JsonMqttHandler.cpp
View File

@@ -127,15 +127,12 @@ bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw)
if(count < 2)
return false;
int size = 32 + (count * 26);
char buf[size];
snprintf(buf, 24, "{\"temperatures\":{");
snprintf(json, 24, "{\"temperatures\":{");
for(int i = 0; i < count; i++) {
TempSensorData* data = hw->getTempSensorData(i);
if(data != NULL) {
char* pos = buf+strlen(buf);
char* pos = json+strlen(json);
snprintf(pos, 26, "\"%s\":%.2f,",
toHex(data->address, 8).c_str(),
data->lastRead
@@ -144,9 +141,9 @@ bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw)
delay(1);
}
}
char* pos = buf+strlen(buf);
char* pos = json+strlen(json);
snprintf(count == 0 ? pos : pos-1, 8, "}}");
return mqtt->publish(topic, buf);
return mqtt->publish(topic, json);
}
bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {