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

More improvements on buffer

Browse Source
This commit is contained in:
Gunnar Skjold 2023-04-15 20:51:35 +02:00
parent b06dbb8d79
commit 4cd6013d64
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/AmsToMqttBridge.ino
View File

@ -100,7 +100,7 @@ AmsMqttHandler* mqttHandler = NULL;
Stream *hanSerial;
SoftwareSerial *swSerial = NULL;
HardwareSerial *hwSerial = NULL;
size_t rxBufferSize = 256;
size_t rxBufferSize = 64;
GpioConfig gpioConfig;
MeterConfig meterConfig;
@ -420,8 +420,8 @@ void loop() {
if(hwSerial->hasOverrun()) {
meterState.setLastError(METER_ERROR_BUFFER);
if(rxBufferSize < MAX_RX_BUFFER_SIZE) {
rxBufferSize += 256;
debugI("Incresing RX buffer to %d bytes", rxBufferSize);
rxBufferSize += 64;
debugI("Increasing RX buffer to %d bytes", rxBufferSize);
config.setMeterChanged();
}
}
@ -429,8 +429,8 @@ void loop() {
} else if(swSerial != NULL) {
if(swSerial->overflow()) {
meterState.setLastError(METER_ERROR_BUFFER);
rxBufferSize += 256;
debugI("Incresing RX buffer to %d bytes", rxBufferSize);
rxBufferSize += 64;
debugI("Increasing RX buffer to %d bytes", rxBufferSize);
config.setMeterChanged();
}
}
@ -668,8 +668,8 @@ void rxerr(int err) {
case 2:
debugE("Serial buffer full");
if(rxBufferSize < MAX_RX_BUFFER_SIZE) {
rxBufferSize += 256;
debugI("Incresing RX buffer to %d bytes", rxBufferSize);
rxBufferSize += 64;
debugI("Increasing RX buffer to %d bytes", rxBufferSize);
config.setMeterChanged();
}
break;
@ -821,6 +821,13 @@ void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal,
while (hanSerial->available() > 0) {
hanSerial->read();
}
#if defined(ESP8266)
if(hwSerial != NULL) {
hwSerial->hasOverrun();
} else if(swSerial != NULL) {
swSerial->overflow();
}
#endif
}
void errorBlink() {