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

Merge branch 'master' into dev-v2.3

Browse Source
This commit is contained in:
Gunnar Skjold 2023-11-16 18:35:50 +01:00
commit 76d76844a9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AmsToMqttBridge.cpp
View File

@ -114,8 +114,6 @@ AmsWebServer ws(commonBuffer, &Debug, &hw);
bool mqttEnabled = false;
AmsMqttHandler* mqttHandler = NULL;
SystemConfig sysConfig;
GpioConfig gpioConfig;
#if defined(ESP32)
JsonMqttHandler* energySpeedometer = NULL;
MqttConfig energySpeedometerConfig = {
@ -139,6 +137,14 @@ MqttConfig energySpeedometerConfig = {
};
#endif
Stream *hanSerial;
SoftwareSerial *swSerial = NULL;
HardwareSerial *hwSerial = NULL;
uint8_t rxBufferErrors = 0;
SystemConfig sysConfig;
GpioConfig gpioConfig;
MeterConfig meterConfig;
AmsData meterState;
bool ntpEnabled = false;
@ -159,7 +165,6 @@ RealtimePlot rtp;
MeterCommunicator* mc = NULL;
PassiveMeterCommunicator* passiveMc = NULL;
KamstrupPullCommunicator* kamstrupMc = NULL;
HardwareSerial* hwSerial = NULL;
bool networkConnected = false;
bool setupMode = false;