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

Some HAN serial port debugging

Browse Source
This commit is contained in:
Gunnar Skjold
2023-04-07 08:36:42 +02:00
parent 68bbfd6527
commit b7854baa6d
5 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/AmsToMqttBridge.h
View File

@@ -12,6 +12,16 @@
#define METER_SOURCE_MQTT 2
#define METER_SOURCE_ESPNOW 3
#define METER_ERROR_NO_DATA 90
#define METER_ERROR_BREAK 91
#define METER_ERROR_BUFFER 92
#define METER_ERROR_FIFO 93
#define METER_ERROR_FRAME 94
#define METER_ERROR_PARITY 95
#define METER_ERROR_RX 96
#define METER_ERROR_EXCEPTION 98
#define METER_ERROR_AUTODETECT 99
#include <SoftwareSerial.h>
#if defined(ESP8266)

34
src/AmsToMqttBridge.ino
View File

@@ -99,6 +99,7 @@ AmsMqttHandler* mqttHandler = NULL;
Stream *hanSerial;
SoftwareSerial *swSerial = NULL;
HardwareSerial *hwSerial = NULL;
GpioConfig gpioConfig;
MeterConfig meterConfig;
@@ -410,6 +411,21 @@ void loop() {
errorBlink();
}
if(hwSerial != NULL) {
#if defined ESP8266
if(hwSerial->hasRxError()) {
meterState.setLastError(METER_ERROR_RX);
}
if(hwSerial->hasOverrun()) {
meterState.setLastError(METER_ERROR_BUFFER);
}
#endif
} else if(swSerial != NULL) {
if(swSerial->overflow()) {
meterState.setLastError(METER_ERROR_BUFFER);
}
}
// Only do normal stuff if we're not booted as AP
if (WiFi.getMode() != WIFI_AP) {
if (WiFi.status() != WL_CONNECTED) {
@@ -600,7 +616,7 @@ void loop() {
}
} catch(const std::exception& e) {
debugE("Exception in readHanPort (%s)", e.what());
meterState.setLastError(98);
meterState.setLastError(METER_ERROR_EXCEPTION);
}
try {
if(meterState.getListType() == 0) {
@@ -623,7 +639,7 @@ void loop() {
}
} catch(const std::exception& e) {
debugE("Exception in meter autodetect (%s)", e.what());
meterState.setLastError(99);
meterState.setLastError(METER_ERROR_AUTODETECT);
}
delay(1); // Needed for auto modem sleep
@@ -634,6 +650,11 @@ void loop() {
#endif
}
void rxerr(int err) {
if(err == 0) return;
meterState.setLastError(90+err);
}
void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal, bool invert) {
uint8_t pin = gpioConfig.hanPin;
@@ -656,7 +677,6 @@ void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal,
break;
}
HardwareSerial *hwSerial = NULL;
if(pin == 3 || pin == 113) {
hwSerial = &Serial;
}
@@ -721,7 +741,12 @@ void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal,
}
#endif
//hwSerial->setRxBufferSize(768);
#if defined(ESP32)
hwSerial->onReceiveError(rxerr);
#endif
hanSerial = hwSerial;
swSerial = NULL;
} else {
debugD("Software serial");
Serial.flush();
@@ -753,6 +778,7 @@ void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal,
Serial.end();
Serial.begin(115200);
hwSerial = NULL;
}
// The library automatically sets the pullup in Serial.begin()
@@ -776,7 +802,7 @@ void errorBlink() {
if(lastErrorBlink - meterState.getLastUpdateMillis() > 30000) {
debugW("No HAN data received last 30s, single blink");
hw.ledBlink(LED_RED, 1); // If no message received from AMS in 30 sec, blink once
if(meterState.getLastError() == 0) meterState.setLastError(90);
if(meterState.getLastError() == 0) meterState.setLastError(METER_ERROR_NO_DATA);
return;
}
break;