github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-04 23:26:17 +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
parent 517a40b0a6 b2174dd521
commit f484f3eb0e
2 changed files with 16 additions and 12 deletions
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> #include <OneWire.h>
#define TEMP_SENSOR_PIN 5 // Temperature sensor connected to GPIO5 #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; HardwareSerial *hanSerial = &Serial;
#endif
// Build settings for Wemos Lolin D32 // Build settings for Wemos Lolin D32
#elif defined(ARDUINO_LOLIN_D32) #elif defined(ARDUINO_LOLIN_D32)

22
src/AmsToMqttBridge.ino
View File

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