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

Fixed issue where GPIO setup becomes invalid

Browse Source
This commit is contained in:
Gunnar Skjold
2023-01-18 17:11:01 +01:00
parent 4b15ac74fc
commit e8fc6d48bf
2 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/AmsToMqttBridge.ino
View File

@@ -121,47 +121,6 @@ DSMRParser *dsmrParser = NULL;
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
if(!config.getGpioConfig(gpioConfig)) {
#if HW_ROARFRED
gpioConfig.hanPin = 3;
gpioConfig.apPin = 0;
gpioConfig.ledPin = 2;
gpioConfig.ledInverted = true;
gpioConfig.tempSensorPin = 5;
#elif defined(ARDUINO_ESP8266_WEMOS_D1MINI)
gpioConfig.hanPin = 5;
gpioConfig.apPin = 4;
gpioConfig.ledPin = 2;
gpioConfig.ledInverted = true;
gpioConfig.tempSensorPin = 14;
gpioConfig.vccMultiplier = 1100;
#elif defined(ARDUINO_LOLIN_D32)
gpioConfig.hanPin = 16;
gpioConfig.ledPin = 5;
gpioConfig.ledInverted = true;
gpioConfig.tempSensorPin = 14;
#elif defined(ARDUINO_FEATHER_ESP32)
gpioConfig.hanPin = 16;
gpioConfig.ledPin = 2;
gpioConfig.tempSensorPin = 14;
#elif defined(ARDUINO_ESP32_DEV)
gpioConfig.hanPin = 16;
gpioConfig.ledPin = 2;
gpioConfig.ledInverted = true;
#elif defined(ESP8266)
gpioConfig.hanPin = 3;
gpioConfig.ledPin = 2;
gpioConfig.ledInverted = true;
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
gpioConfig.hanPin = 18;
#elif defined(ESP32)
gpioConfig.hanPin = 16;
gpioConfig.ledPin = 2;
gpioConfig.ledInverted = true;
gpioConfig.tempSensorPin = 14;
#endif
}
delay(1); delay(1);
config.loadTempSensors(); config.loadTempSensors();
hw.setup(&gpioConfig, &config); hw.setup(&gpioConfig, &config);

8
src/web/AmsWebServer.cpp
View File

@@ -1023,6 +1023,7 @@ void AmsWebServer::handleSetup() {
switch(sys.boardType) { switch(sys.boardType) {
case 0: // roarfred case 0: // roarfred
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3; gpioConfig->hanPin = 3;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPin = 2; gpioConfig->ledPin = 2;
@@ -1030,6 +1031,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->tempSensorPin = 5; gpioConfig->tempSensorPin = 5;
break; break;
case 1: // Arnio Kamstrup case 1: // Arnio Kamstrup
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3; gpioConfig->hanPin = 3;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPin = 2; gpioConfig->ledPin = 2;
@@ -1039,6 +1041,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->ledRgbInverted = true; gpioConfig->ledRgbInverted = true;
break; break;
case 2: // spenceme case 2: // spenceme
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3; gpioConfig->hanPin = 3;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPin = 2; gpioConfig->ledPin = 2;
@@ -1048,6 +1051,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1; wifi.sleep = 1;
break; break;
case 3: // Pow UART0 case 3: // Pow UART0
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3; gpioConfig->hanPin = 3;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPin = 2; gpioConfig->ledPin = 2;
@@ -1058,6 +1062,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1; wifi.sleep = 1;
break; break;
case 4: // Pow GPIO12 case 4: // Pow GPIO12
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 12; gpioConfig->hanPin = 12;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPin = 2; gpioConfig->ledPin = 2;
@@ -1068,6 +1073,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1; wifi.sleep = 1;
break; break;
case 5: // Pow-K+ UART2 case 5: // Pow-K+ UART2
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16; gpioConfig->hanPin = 16;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13; gpioConfig->ledPinRed = 13;
@@ -1079,6 +1085,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1; wifi.sleep = 1;
break; break;
case 6: // Pow-P1 case 6: // Pow-P1
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16; gpioConfig->hanPin = 16;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13; gpioConfig->ledPinRed = 13;
@@ -1089,6 +1096,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->vccResistorVcc = 33; gpioConfig->vccResistorVcc = 33;
break; break;
case 7: // Pow-U+ case 7: // Pow-U+
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16; gpioConfig->hanPin = 16;
gpioConfig->apPin = 0; gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13; gpioConfig->ledPinRed = 13;