From 4b15ac74fc211031b310f7755873d7710ef949bd Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Tue, 17 Jan 2023 18:05:44 +0100 Subject: [PATCH 1/2] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 6401c357..11b51ed3 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: ["https://paypal.me/gskjold"] +custom: ["https://amsleser.no"] From e8fc6d48bfae5fc9730eee2a8e566f8c4252cb50 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Wed, 18 Jan 2023 17:11:01 +0100 Subject: [PATCH 2/2] Fixed issue where GPIO setup becomes invalid --- src/AmsToMqttBridge.ino | 41 ---------------------------------------- src/web/AmsWebServer.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index c900330e..12415b10 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -121,47 +121,6 @@ DSMRParser *dsmrParser = NULL; void setup() { 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); config.loadTempSensors(); hw.setup(&gpioConfig, &config); diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index 00899897..7cb12c45 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -1023,6 +1023,7 @@ void AmsWebServer::handleSetup() { switch(sys.boardType) { case 0: // roarfred + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 3; gpioConfig->apPin = 0; gpioConfig->ledPin = 2; @@ -1030,6 +1031,7 @@ void AmsWebServer::handleSetup() { gpioConfig->tempSensorPin = 5; break; case 1: // Arnio Kamstrup + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 3; gpioConfig->apPin = 0; gpioConfig->ledPin = 2; @@ -1039,6 +1041,7 @@ void AmsWebServer::handleSetup() { gpioConfig->ledRgbInverted = true; break; case 2: // spenceme + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 3; gpioConfig->apPin = 0; gpioConfig->ledPin = 2; @@ -1048,6 +1051,7 @@ void AmsWebServer::handleSetup() { wifi.sleep = 1; break; case 3: // Pow UART0 + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 3; gpioConfig->apPin = 0; gpioConfig->ledPin = 2; @@ -1058,6 +1062,7 @@ void AmsWebServer::handleSetup() { wifi.sleep = 1; break; case 4: // Pow GPIO12 + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 12; gpioConfig->apPin = 0; gpioConfig->ledPin = 2; @@ -1068,6 +1073,7 @@ void AmsWebServer::handleSetup() { wifi.sleep = 1; break; case 5: // Pow-K+ UART2 + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 16; gpioConfig->apPin = 0; gpioConfig->ledPinRed = 13; @@ -1079,6 +1085,7 @@ void AmsWebServer::handleSetup() { wifi.sleep = 1; break; case 6: // Pow-P1 + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 16; gpioConfig->apPin = 0; gpioConfig->ledPinRed = 13; @@ -1089,6 +1096,7 @@ void AmsWebServer::handleSetup() { gpioConfig->vccResistorVcc = 33; break; case 7: // Pow-U+ + config->clearGpio(*gpioConfig); gpioConfig->hanPin = 16; gpioConfig->apPin = 0; gpioConfig->ledPinRed = 13;