github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-29 13:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing file from last commit

Browse Source
This commit is contained in:
Gunnar Skjold
2021-11-27 20:29:18 +01:00
parent dc5bfff655
commit f425abb52d
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/AmsToMqttBridge.ino
View File

@@ -141,7 +141,6 @@ void setup() {
Serial.end(); Serial.end();
if(gpioConfig.hanPin == 3) { if(gpioConfig.hanPin == 3) {
shared = true; shared = true;
<<<<<<< HEAD
#if defined(ESP8266) #if defined(ESP8266)
SerialConfig serialConfig; SerialConfig serialConfig;
#elif defined(ESP32) #elif defined(ESP32)
@@ -170,9 +169,6 @@ void setup() {
if(!shared) { if(!shared) {
Serial.begin(115200); Serial.begin(115200);
=======
setupHanPort(gpioConfig.hanPin, meterConfig.type);
>>>>>>> master
} }
DebugConfig debug; DebugConfig debug;
@@ -488,7 +484,6 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
hwSerial = &Serial; hwSerial = &Serial;
} }
#if defined(ESP32) #if defined(ESP32)
if(pin == 9) { if(pin == 9) {
hwSerial = &Serial1; hwSerial = &Serial1;
@@ -505,7 +500,6 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
if(hwSerial != NULL) { if(hwSerial != NULL) {
debugD("Hardware serial"); debugD("Hardware serial");
<<<<<<< HEAD
Serial.flush(); Serial.flush();
#if defined(ESP8266) #if defined(ESP8266)
SerialConfig serialConfig; SerialConfig serialConfig;
@@ -521,28 +515,18 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
break; break;
case 10: case 10:
serialConfig = SERIAL_7E1; serialConfig = SERIAL_7E1;
=======
hwSerial->flush();
hwSerial->end();
switch(newMeterType) {
case METER_TYPE_KAMSTRUP:
case METER_TYPE_OMNIPOWER:
hwSerial->begin(2400, SERIAL_8N1);
>>>>>>> master
break; break;
default: default:
serialConfig = SERIAL_8E1; serialConfig = SERIAL_8E1;
break; break;
} }
<<<<<<< HEAD
#if defined(ESP32) #if defined(ESP32)
hwSerial->begin(baud, serialConfig, -1, -1, invert); hwSerial->begin(baud, serialConfig, -1, -1, invert);
#else #else
hwSerial->begin(baud, serialConfig, SERIAL_FULL, 1, invert); hwSerial->begin(baud, serialConfig, SERIAL_FULL, 1, invert);
#endif #endif
=======
#if defined(ESP8266) #if defined(ESP8266)
if(pin == 3) { if(pin == 3) {
debugI("Switching UART0 to pin 1 & 3"); debugI("Switching UART0 to pin 1 & 3");
@@ -553,20 +537,16 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
} }
#endif #endif
>>>>>>> master
hanSerial = hwSerial; hanSerial = hwSerial;
} else { } else {
debugD("Software serial"); debugD("Software serial");
Serial.flush(); Serial.flush();
<<<<<<< HEAD
=======
if(swSerial != NULL) { if(swSerial != NULL) {
swSerial->end(); swSerial->end();
delete swSerial; delete swSerial;
} }
swSerial = new SoftwareSerial(pin); swSerial = new SoftwareSerial(pin);
>>>>>>> master
SoftwareSerialConfig serialConfig; SoftwareSerialConfig serialConfig;
switch(parityOrdinal) { switch(parityOrdinal) {