Merge pull request #238 from fiendie/wifi_manager

Add support for WiFiManager, remove soft AP
rancilio-pid · Jun 7, 2022 · 24e51ea · 24e51ea
2 parents 2951ecf + a9841f8
commit 24e51ea
Show file tree

Hide file tree

Showing 12 changed files with 216 additions and 386 deletions.
diff --git a/data/html/settings.htm b/data/html/settings.htm
@@ -8,15 +8,6 @@ <h5 class="card-title">
                         WiFi Settings
                     </h5>
                 </div>
-                <div class="card-body border-bottom">
-                    <h6 class="content-subhead">AP Mode</h6>
-                    <p>
-                        These values are hard-coded at the moment and cannot be edited:<br>
-                        AP name: <b>%VAR_SHOW_AP_WIFI_SSID%</b><br>
-                        Password: <b>%VAR_SHOW_AP_WIFI_KEY%</b>
-
-                    </p>
-                </div>
                 <div class="card-body">
                     <h6 class="content-subhead">Client Mode</h6>
                     <p>

diff --git a/platformio_sample.ini b/platformio_sample.ini
@@ -4,19 +4,21 @@ src_dir = src
 
 [env]
 lib_deps =
-       lebuni/ZACwire for TSic @ ^2.0.0
-      schm1tz1/TSIC @ ^1.1.2
-      milesburton/DallasTemperature @ ^3.9.1
-      paulstoffregen/OneWire @ ^2.3.5
-      adafruit/Adafruit_VL53L0X @ ^1.1.1
-      olkal/HX711_ADC @ ^1.2.8
-      olikraus/U8g2 @ ^2.28.8
-      br3ttb/PID @ ^1.2.1
-      knolleary/PubSubClient @ ^2.8
-      me-no-dev/AsyncTCP @ ^1.1.1
-      me-no-dev/ESP Async WebServer @ ^1.2.3
-      bblanchon/ArduinoJson @ ^6.18.5
-      tobiasschuerg/ESP8266 Influxdb @ 3.9.0
+    lebuni/ZACwire for TSic @ ^2.0.0
+    schm1tz1/TSIC @ ^1.1.2
+    milesburton/DallasTemperature @ ^3.9.1
+    paulstoffregen/OneWire @ ^2.3.5
+    adafruit/Adafruit_VL53L0X @ ^1.1.1
+    olkal/HX711_ADC @ ^1.2.8
+    olikraus/U8g2 @ ^2.28.8
+    br3ttb/PID @ ^1.2.1
+    knolleary/PubSubClient @ ^2.8
+    me-no-dev/AsyncTCP @ ^1.1.1
+    bblanchon/ArduinoJson @ ^6.18.5
+    tobiasschuerg/ESP8266 Influxdb @ 3.9.0
+    git+https://github.com/me-no-dev/ESPAsyncWebServer
+    git+https://github.com/tzapu/WiFiManager
+
 [env:nodemcuv2_usb]
 platform = espressif8266 @ ^2.6.3
 board = nodemcuv2

diff --git a/src/Displaytemplateminimal.h b/src/Displaytemplateminimal.h
@@ -103,7 +103,7 @@ void printScreen() {
             }
 
             // Für Statusinfos
-            if (Offlinemodus == 0) {
+            if (offlineMode == 0) {
                 getSignalStrength();
 
                 if (WiFi.status() != WL_CONNECTED) {

diff --git a/src/Displaytemplatescale.h b/src/Displaytemplatescale.h
@@ -102,7 +102,7 @@ void printScreen() {
         // Für Statusinfos
         u8g2.drawFrame(32, 0, 128, 12);
 
-        if (Offlinemodus == 0) {
+        if (offlineMode == 0) {
             getSignalStrength();
 
             if (WiFi.status() == WL_CONNECTED) {
@@ -138,7 +138,7 @@ void printScreen() {
             }
         } else {
             u8g2.setCursor(40, 2);
-            u8g2.print("Offlinemodus");
+            u8g2.print("Offline Mode");
         }
 
         if (TOF == 1) {

diff --git a/src/Displaytemplatestandard.h b/src/Displaytemplatestandard.h
@@ -113,7 +113,7 @@ void printScreen()
         // Für Statusinfos
         u8g2.drawFrame(32, 0, 128, 12);
 
-        if (Offlinemodus == 0) {
+        if (offlineMode == 0) {
             getSignalStrength();
 
             if (WiFi.status() == WL_CONNECTED) {

diff --git a/src/Displaytemplatetemponly.h b/src/Displaytemplatetemponly.h
@@ -48,7 +48,7 @@ void printScreen() {
         }
 
         // Für Statusinfos
-        if (Offlinemodus == 0) {
+        if (offlineMode == 0) {
             getSignalStrength();
 
             if (WiFi.status() != WL_CONNECTED) {

diff --git a/src/Displaytemplateupright.h b/src/Displaytemplateupright.h
@@ -106,7 +106,7 @@ void printScreen() {
             // Für Statusinfos
             u8g2.drawFrame(0, 0, 64, 12);
 
-            if (Offlinemodus == 0) {
+            if (offlineMode == 0) {
                 getSignalStrength();
 
                 if (WiFi.status() == WL_CONNECTED) {

diff --git a/src/RancilioServer.h b/src/RancilioServer.h
@@ -17,6 +17,7 @@
 #elif defined(ESP8266)
     #include <ESP8266WiFi.h>
     #include <ESPAsyncTCP.h>
+    #define WEBSERVER_H
 #endif
 
 #include <ESPAsyncWebServer.h>

diff --git a/src/brewvoid.h b/src/brewvoid.h
@@ -140,7 +140,7 @@ void checkbrewswitch() {
 void backflush() {
     if (backflushState != 10 && backflushON == 0) {
         backflushState = 43;  // force reset in case backflushON is reset during backflush!
-    } else if (Offlinemodus == 1 || brewcounter > 10 || maxflushCycles <= 0 || backflushON == 0) {
+    } else if (offlineMode == 1 || brewcounter > 10 || maxflushCycles <= 0 || backflushON == 0) {
         return;
     }
 

diff --git a/src/display.h b/src/display.h
@@ -160,7 +160,7 @@ void Displaymachinestate() {
         u8g2.clearBuffer();
         u8g2.drawFrame(8, 0, 110, 12);
 
-        if (Offlinemodus == 0) {
+        if (offlineMode == 0) {
             getSignalStrength();
 
             if (WiFi.status() == WL_CONNECTED) {