From 21bff28aee900725ff73c48ad887b2b4c113af1b Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Fri, 26 Jan 2024 20:17:13 +0100 Subject: [PATCH] Smart config --- .github/workflows/release.yml | 1 + platformio.ini | 1 + src/AmsToMqttBridge.cpp | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eaf3984e..b1068853 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,7 @@ jobs: run: | sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini + sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini diff --git a/platformio.ini b/platformio.ini index fa82b0e9..83e43f19 100755 --- a/platformio.ini +++ b/platformio.ini @@ -14,6 +14,7 @@ build_flags = -D WEBSOCKET_DISABLED=1 -D NO_AMS2MQTT_PRICE_KEY -D NO_AMS2MQTT_PRICE_AUTHENTICATION + -D NO_AMS2MQTT_SC_KEY -D NO_ENERGY_SPEEDOMETER_USER -D NO_ENERGY_SPEEDOMETER_PASS -fexceptions diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp index 5bd4cdea..8c22f976 100644 --- a/src/AmsToMqttBridge.cpp +++ b/src/AmsToMqttBridge.cpp @@ -1162,7 +1162,11 @@ void toggleSetupMode() { */ WiFi.mode(WIFI_AP_STA); + #if defined(ESP32) && defined(AMS2MQTT_SC_KEY) + WiFi.beginSmartConfig(SC_TYPE_ESPTOUCH_V2, AMS2MQTT_SC_KEY); + #else WiFi.beginSmartConfig(); + #endif WiFi.softAP(PSTR("AMS2MQTT")); if(dnsServer == NULL) {