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

Added support for uart_swap for ESP8266

Browse Source
This commit is contained in:
Gunnar Skjold 2021-11-08 12:05:48 +01:00
parent 72bdb6e363
commit 4c92e592d6
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/AmsToMqttBridge.ino
View File

@ -140,21 +140,11 @@ void setup() {
bool shared = false;
config.getMeterConfig(meterConfig);
Serial.flush();
Serial.end();
if(gpioConfig.hanPin == 3) {
shared = true;
switch(meterConfig.type) {
case METER_TYPE_KAMSTRUP:
case METER_TYPE_OMNIPOWER:
Serial.begin(2400, SERIAL_8N1);
break;
default:
Serial.begin(2400, SERIAL_8E1);
break;
}
}
if(!shared) {
Serial.begin(115200);
setupHanPort(gpioConfig.hanPin, meterConfig.type);
}
DebugConfig debug;
@ -459,9 +449,11 @@ void setupHanPort(int pin, int newMeterType) {
debugI("Setting up HAN on pin %d for meter type %d", pin, newMeterType);
HardwareSerial *hwSerial = NULL;
if(pin == 3) {
if(pin == 3 || pin == 113) {
hwSerial = &Serial;
}
#if defined(ESP32)
if(pin == 9) {
hwSerial = &Serial1;
@ -478,7 +470,9 @@ void setupHanPort(int pin, int newMeterType) {
if(hwSerial != NULL) {
debugD("Hardware serial");
Serial.flush();
hwSerial->flush();
hwSerial->end();
switch(newMeterType) {
case METER_TYPE_KAMSTRUP:
case METER_TYPE_OMNIPOWER:
@ -488,6 +482,17 @@ void setupHanPort(int pin, int newMeterType) {
hwSerial->begin(2400, SERIAL_8E1);
break;
}
#if defined(ESP8266)
if(pin == 3) {
debugI("Switching UART0 to pin 1 & 3");
Serial.pins(1,3);
} else if(pin == 113) {
debugI("Switching UART0 to pin 15 & 13");
Serial.pins(15,13);
}
#endif
hanSerial = hwSerial;
} else {
debugD("Software serial");
@ -505,6 +510,7 @@ void setupHanPort(int pin, int newMeterType) {
}
hanSerial = swSerial;
Serial.end();
Serial.begin(115200);
}

5
src/web/AmsWebServer.cpp
View File

@ -1211,6 +1211,11 @@ String AmsWebServer::getSerialSelectOptions(int selected) {
#elif defined(ESP8266)
int numGpio = 9;
int gpios[] = {4,5,9,10,12,13,14,15,16};
if(selected == 113) {
gpioOptions += "<option value=\"113\" selected>UART2 (GPIO13)</option>";
} else {
gpioOptions += "<option value=\"113\">UART2 (GPIO13)</option>";
}
#endif
for(int i = 0; i < numGpio; i++) {