github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-25 20:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed buffer size defaults and some null terminator issues on json mqtt

Browse Source
This commit is contained in:
Gunnar Skjold
2024-05-01 07:38:30 +02:00
parent 05506cdc9f
commit 99e341e582
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/JsonMqttHandler/src/JsonMqttHandler.cpp
View File

@@ -96,7 +96,8 @@ bool JsonMqttHandler::publishList1(AmsData* data, EnergyAccounting* ea) {
} }
pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"P\":%d"), data->getActiveImportPower()); pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"P\":%d"), data->getActiveImportPower());
pos += appendJsonFooter(ea, pos); pos += appendJsonFooter(ea, pos);
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {
char topic[192]; char topic[192];
snprintf_P(topic, 192, PSTR("%s/list1"), mqttConfig.publishTopic); snprintf_P(topic, 192, PSTR("%s/list1"), mqttConfig.publishTopic);
@@ -127,7 +128,8 @@ bool JsonMqttHandler::publishList2(AmsData* data, EnergyAccounting* ea) {
data->getL3Voltage() data->getL3Voltage()
); );
pos += appendJsonFooter(ea, pos); pos += appendJsonFooter(ea, pos);
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {
char topic[192]; char topic[192];
snprintf_P(topic, 192, PSTR("%s/list2"), mqttConfig.publishTopic); snprintf_P(topic, 192, PSTR("%s/list2"), mqttConfig.publishTopic);
@@ -163,7 +165,8 @@ bool JsonMqttHandler::publishList3(AmsData* data, EnergyAccounting* ea) {
data->getMeterTimestamp() data->getMeterTimestamp()
); );
pos += appendJsonFooter(ea, pos); pos += appendJsonFooter(ea, pos);
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {
char topic[192]; char topic[192];
snprintf_P(topic, 192, PSTR("%s/list3"), mqttConfig.publishTopic); snprintf_P(topic, 192, PSTR("%s/list3"), mqttConfig.publishTopic);
@@ -215,7 +218,8 @@ bool JsonMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea) {
data->getMeterTimestamp() data->getMeterTimestamp()
); );
pos += appendJsonFooter(ea, pos); pos += appendJsonFooter(ea, pos);
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {
char topic[192]; char topic[192];
snprintf_P(topic, 192, PSTR("%s/list4"), mqttConfig.publishTopic); snprintf_P(topic, 192, PSTR("%s/list4"), mqttConfig.publishTopic);
@@ -256,7 +260,8 @@ bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw)
bool ret = false; bool ret = false;
json[pos-1] = '}'; json[pos-1] = '}';
if(mqttConfig.payloadFormat != 6) { if(mqttConfig.payloadFormat != 6) {
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
} }
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {
char topic[192]; char topic[192];
@@ -382,7 +387,8 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
ts6hr ts6hr
); );
if(mqttConfig.payloadFormat != 6) { if(mqttConfig.payloadFormat != 6) {
json[pos] = '}'; json[pos++] = '}';
json[pos] = '\0';
} }
bool ret = false; bool ret = false;
if(mqttConfig.payloadFormat == 5) { if(mqttConfig.payloadFormat == 5) {

4
lib/SvelteUi/src/AmsWebServer.cpp
View File

@@ -1181,6 +1181,7 @@ void AmsWebServer::handleSave() {
case 6: // Pow-P1 case 6: // Pow-P1
meterConfig.baud = 115200; meterConfig.baud = 115200;
meterConfig.parity = 3; // 8N1 meterConfig.parity = 3; // 8N1
meterConfig.bufferSize = 8;
break; break;
case 3: // Pow-K UART0 case 3: // Pow-K UART0
case 5: // Pow-K+ case 5: // Pow-K+
@@ -1200,6 +1201,9 @@ void AmsWebServer::handleSave() {
network.sleep = 2; // Light sleep network.sleep = 2; // Light sleep
break; break;
} }
#if defined(ESP8266)
meterConfig.bufferSize = 1;
#endif
config->setNetworkConfig(network); config->setNetworkConfig(network);
config->setMeterConfig(meterConfig); config->setMeterConfig(meterConfig);

22
src/PassiveMeterCommunicator.cpp
View File

@@ -172,26 +172,6 @@ bool PassiveMeterCommunicator::loop() {
dataAvailable = true; dataAvailable = true;
lastError = DATA_PARSE_OK; lastError = DATA_PARSE_OK;
// After one hour, adjust buffer size to match the largest payload
if(!maxDetectPayloadDetectDone && now > 3600000) {
if(maxDetectedPayloadSize * 1.25 > meterConfig.bufferSize * 64) {
int bufferSize = min((double) 64, ceil((maxDetectedPayloadSize * 1.25) / 64));
#if defined(ESP8266)
if(meterConfig.rxPin != 3 && meterConfig.rxPin != 113) {
bufferSize = min(bufferSize, 2);
} else {
bufferSize = min(bufferSize, 8);
}
#endif
if(bufferSize != meterConfig.bufferSize) {
if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Increasing RX buffer to %d bytes\n"), meterConfig.bufferSize * 64);
meterConfig.bufferSize = bufferSize;
configChanged = true;
}
}
maxDetectPayloadDetectDone = true;
}
return true; return true;
} }
@@ -671,7 +651,7 @@ void PassiveMeterCommunicator::rxerr(int err) {
case 2: case 2:
if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Serial buffer overflow\n")); if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Serial buffer overflow\n"));
rxBufferErrors++; rxBufferErrors++;
if(rxBufferErrors > 3 && meterConfig.bufferSize < 64) { if(rxBufferErrors > 1 && meterConfig.bufferSize < 8) {
meterConfig.bufferSize += 2; meterConfig.bufferSize += 2;
if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Increasing RX buffer to %d bytes\n"), meterConfig.bufferSize * 64); if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Increasing RX buffer to %d bytes\n"), meterConfig.bufferSize * 64);
configChanged = true; configChanged = true;