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

Merge branch 'dev-v1.0.1' into dev-v1.1.0

Browse Source
This commit is contained in:
Gunnar Skjold 2020-02-14 20:19:15 +01:00
commit f484f3eb0e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AmsToMqttBridge.h
View File

@ -19,7 +19,13 @@
#include <OneWire.h>
#define TEMP_SENSOR_PIN 5 // Temperature sensor connected to GPIO5
#if DEBUG_MODE
#define SOFTWARE_SERIAL 1
#include <SoftwareSerial.h>
SoftwareSerial *hanSerial = new SoftwareSerial(3);
#else
HardwareSerial *hanSerial = &Serial;
#endif
// Build settings for Wemos Lolin D32
#elif defined(ARDUINO_LOLIN_D32)

22
src/AmsToMqttBridge.ino
View File

@ -35,7 +35,7 @@ WiFiClient *client;
MQTTClient mqtt(512);
// Object used for debugging
HardwareSerial* debugger = NULL;
Stream* debugger = NULL;
// The HAN Port reader, used to read serial data and decode DLMS
HanReader hanReader;
@ -47,17 +47,15 @@ void setup() {
}
#if DEBUG_MODE
debugger = &Serial;
#if SOFTWARE_SERIAL
debugger->begin(115200, SERIAL_8N1);
#else
if(config.getMeterType() == 3) {
hanSerial->begin(2400, SERIAL_8N1);
} else {
hanSerial->begin(2400, SERIAL_8E1);
}
#endif
while (!&debugger);
#if HW_ROARFRED
SoftwareSerial *ser = new SoftwareSerial(-1, 1);
ser->begin(115200, SWSERIAL_8N1);
debugger = ser;
#else
HardwareSerial *ser = &Serial;
ser->begin(115200, SERIAL_8N1);
#endif
debugger = ser;
#endif
if (debugger) {