github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 20:23:41 +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

22
src/PassiveMeterCommunicator.cpp
View File

@@ -172,26 +172,6 @@ bool PassiveMeterCommunicator::loop() {
dataAvailable = true;
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;
}
@@ -671,7 +651,7 @@ void PassiveMeterCommunicator::rxerr(int err) {
case 2:
if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Serial buffer overflow\n"));
rxBufferErrors++;
if(rxBufferErrors > 3 && meterConfig.bufferSize < 64) {
if(rxBufferErrors > 1 && meterConfig.bufferSize < 8) {
meterConfig.bufferSize += 2;
if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Increasing RX buffer to %d bytes\n"), meterConfig.bufferSize * 64);
configChanged = true;