esp32.h, glcd.cpp, network_common.cpp: setup rudimentary AP instead of SmartConfig

Author: dingo35

SmartEVSE-3/src/esp32.h

@@ -98,7 +98,6 @@ extern portMUX_TYPE rtc_spinlock;   //TODO: Will be placed in the appropriate po
 #define RTC_EXIT_CRITICAL()     portEXIT_CRITICAL(&rtc_spinlock)
 
 
-extern char SmartConfigKey[];
 extern struct tm timeinfo;
 
 

SmartEVSE-3/src/glcd.cpp

@@ -87,8 +87,8 @@ uint32_t ScrollTimer = 0;
 
 extern void CheckSwitch(bool force = false);
 extern void handleWIFImode(void *s  = &Serial);
-extern char SmartConfigKey[16];
 extern Button ExtSwitch;
+extern String APpassword;
 unsigned char activeRow;
 extern Switch_Phase_t Switching_Phases_C2;
 extern uint8_t RCMTestCounter;
@@ -500,19 +500,17 @@ void GLCD(void) {
                     GLCD_write_buf_str(127,0, Str, GLCD_ALIGN_RIGHT);
                 } else GLCD_write_buf_str(0,0, "Not connected to WiFi", GLCD_ALIGN_LEFT);
 
-            // When Wifi Setup is selected, show AES key for the ESPTouch app
+            // When Wifi Setup is selected, show password and SSID of the Access Point
             } else if (WIFImode == 2) {
                 if (SubMenu && WiFi.getMode() != WIFI_AP_STA) {           // Do not show if AP_STA mode is started
-                    sprintf(Str, "O button starts config");
+                    sprintf(Str, "O button starts portal");
                     GLCD_write_buf_str(0,0, Str, GLCD_ALIGN_LEFT);
                 } else {
-                    // Show ESPTouch key
-                    sprintf(Str, "Key:%s", SmartConfigKey);
-                    GLCD_write_buf_str(0, 0, Str, GLCD_ALIGN_LEFT);
-                    GLCD_sendbuf(7, 1);
-                    GLCD_buffer_clr();
-                    sprintf(Str, "Now use EspTouch app ");
-                    GLCD_write_buf_str(0, 0, Str, GLCD_ALIGN_LEFT);
+                    // Show Access Point password
+                    //sprintf(Str, "AP:SmartEVSE-config");
+                    //GLCD_write_buf_str(0,0, Str, GLCD_ALIGN_LEFT);
+                    sprintf(Str, "Portal PW:%s", APpassword.c_str());
+                    GLCD_write_buf_str(0,0, Str, GLCD_ALIGN_LEFT);
                 }
             }
         }

SmartEVSE-3/src/network_common.cpp

@@ -33,6 +33,7 @@ struct mg_mgr mgr;  // Mongoose event manager. Holds all connections
 // end of mongoose stuff
 
 String APhostname = "SmartEVSE-" + String( MacId() & 0xffff, 10);           // SmartEVSE access point Name = SmartEVSE-xxxxx
+String APpassword = "00000000";
 
 #if MQTT && defined(SMARTEVSE_VERSION) // ESP32 only
 // MQTT connection info
@@ -62,92 +63,12 @@ uint32_t serialnr;
 
 // The following data will be updated by eeprom/storage data at powerup:
 uint8_t WIFImode = WIFI_MODE;                                               // WiFi Mode (0:Disabled / 1:Enabled / 2:Start Portal)
-char SmartConfigKey[] = "0123456789abcdef";                                 // SmartConfig / EspTouch AES key, used to encyrypt the WiFi password.
 String TZinfo = "";                                                         // contains POSIX time string
 
 char *downloadUrl = NULL;
 int downloadProgress = 0;
 int downloadSize = 0;
 
-static uint8_t CliState = 0;
-#ifdef SENSORBOX_VERSION
-void ProvisionCli(HardwareSerial &s) {
-//void ProvisionCli(HardwareSerial &s = &Serial) {
-#else
-#if SMARTEVSE_VERSION >=30 && SMARTEVSE_VERSION < 40
-void ProvisionCli(void) {
-    HardwareSerial &s = Serial;
-#else
-void ProvisionCli(HWCDC &s = Serial) {
-#endif
-#endif
-    // SSID and PW for your Router
-    static String Router_SSID, Router_Pass;
-    static char CliBuffer[64];
-    static uint8_t idx = 0;
-    static bool entered = false;
-    char ch;
-
-    if (CliState == 0) {
-        s.println("Enter WiFi access point name:");
-        CliState++;
-
-    } else if (CliState == 1 && entered) {
-        Router_SSID = String(CliBuffer);
-        Router_SSID.trim(); //SSID has no limitations on special characters, so dnt check them
-        CliState++;              // All OK, now request password.
-        idx = 0;
-        entered = false;
-
-    } else if (CliState == 2) {
-        s.println("Enter WiFi password:");
-        CliState++;
-
-    } else if (CliState == 3 && entered) {
-        Router_Pass = String(CliBuffer);
-        Router_Pass.trim();
-        if (idx < 8) {
-            s.println("Password should be min 8 characters.");
-            Router_Pass = "";
-            CliState = 2;
-        } else CliState++;             // All OK
-        idx = 0;
-        entered = false;
-
-    } else if (CliState == 4) {
-        s.println("WiFi credentials stored.");
-        WiFi.mode(WIFI_STA);                // Set Station Mode
-        WiFi.begin(Router_SSID, Router_Pass);   // Configure Wifi with credentials
-        CliState++;
-    }
-
-
-    // read input, and store in buffer until we read a \n
-    while (s.available()) {
-        ch = s.read();
-
-        // When entering a password, replace last character with a *
-        if (CliState == 3 && idx) s.printf("\b*");
-        s.print(ch);
-
-        // check for CR/LF, and make sure the contents of the buffer is atleast 1 character
-        if (ch == '\n' || ch == '\r') {
-            if (idx) {
-                CliBuffer[idx] = 0;         // null terminate
-                entered = true;
-            } else if (CliState == 1 || CliState == 3) CliState--; // Reprint the last message
-        } else if (idx < 63) {              // Store in buffer
-            if (ch == '\b' && idx) {
-                idx--;
-                s.print(" \b");        // erase character from terminal
-            } else {
-                CliBuffer[idx++] = ch;
-            }
-        }
-    }
-}
-
-
 #if MQTT && defined(SMARTEVSE_VERSION) // ESP32 only
 #if MQTT_ESP == 1
 /*
@@ -966,6 +887,26 @@ static void timer_fn(void *arg) {
 }
 #endif
 
+
+// HTML web form for entering WIFI credentials in AP setup portal
+static const char *html_form = R"EOF(
+<!DOCTYPE html><html><head><title>WiFi Setup</title>
+<script>
+function togglePassword(){
+  var x = document.getElementById('password');
+  x.type = x.type === 'password' ? 'text' : 'password';
+}
+</script></head><body>
+<h2>WiFi Configuration</h2>
+<form action="/save" method="POST">
+SSID:<br><input type="text" name="ssid"><br>
+Password:<br><input type="password" name="password" id="password"><br>
+<input type="checkbox" onclick="togglePassword()"> Show Password<br><br>
+<input type="submit" value="Save">
+</form></body></html>
+)EOF";
+
+
 // Connection event handler function
 // indenting lower level two spaces to stay compatible with old StartWebServer
 // We use the same event handler function for HTTP and HTTPS connections
@@ -1002,6 +943,25 @@ static void fn_http_server(struct mg_connection *c, int ev, void *ev_data) {
             }
             shouldReboot = true;
             mg_http_reply(c, 200, "Content-Type: text/plain\r\n", "Erasing settings, rebooting");
+        } else if (mg_http_match_uri(hm, "/") && WIFImode == 2) { // serve AP page to fill in WIFI credentials
+            mg_http_reply(c, 200, "Content-Type: text/html\r\n", "%s", html_form);
+        } else if (mg_http_match_uri(hm, "/save")) {
+            char ssid[64], password[64];
+            bool has_ssid = mg_http_get_var(&hm->body, "ssid", ssid, sizeof(ssid)) > 0;
+            bool has_pass = mg_http_get_var(&hm->body, "password", password, sizeof(password)) > 0;
+            if (has_ssid && has_pass) {
+                mg_http_reply(c, 200, "Content-Type: text/html\r\n", "<html><body><h2>Saved! Rebooting...</h2></body></html>");
+                delay(2000);
+                _LOG_A("Connecting to wifi network.\n");
+                WiFi.mode(WIFI_STA);                // Set Station Mode
+                WiFi.begin(ssid, password);   // Configure Wifi with credentials
+                WIFImode = 1;                                                           // we are already connected so don't call handleWIFImode
+                write_settings();
+                delay(2000);
+                ESP.restart();
+            } else {
+              mg_http_reply(c, 400, "", "Missing SSID or password");
+            }
         } else if (mg_http_match_uri(hm, "/autoupdate")) {
             char owner[40];
             char buf[8];
@@ -1382,88 +1342,29 @@ void onWifiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
 }
 
 
-void SetupPortalTask(void * parameter) {
-#ifdef SENSORBOX_VERSION
-    HardwareSerial *s1 = *((HardwareSerial **)parameter);
-    HardwareSerial &s = *s1;
-#endif
-    _LOG_A("Start Portal...\n");
-    WiFi.disconnect(true);
-
-    // Close Mongoose HTTP Server
-    if (HttpListener80) {
-        HttpListener80->is_closing = 1;
-    }
-    if (HttpListener443) {
-        HttpListener443->is_closing = 1;
-    }
-
-    while (HttpListener80 || HttpListener443) {
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
-        _LOG_A("Waiting for Mongoose Server to terminate\n");
-    }
-
-    //Init WiFi as Station, start SmartConfig
-    WiFi.mode(WIFI_AP_STA);
-    WiFi.beginSmartConfig(SC_TYPE_ESPTOUCH_V2, SmartConfigKey);
- 
-    //Wait for SmartConfig packet from mobile.
-    _LOG_V("Waiting for SmartConfig.\n");
-#ifdef SENSORBOX_VERSION
-    s.end();
-    s.begin(115200, SERIAL_8N1, PIN_RXD, PIN_TXD, false);                    // Input from TX of PIC, and debug output to USB
-#endif
-    unsigned long configTimer = millis();
-    while (!WiFi.smartConfigDone() && (WIFImode == 2) && (WiFi.status() != WL_CONNECTED) && millis() - configTimer < 180000) {
-        // Also start Serial CLI for entering AP and password.
-#ifdef SENSORBOX_VERSION
-        ProvisionCli(s);
-#else
-        ProvisionCli();
-#endif
-        delay(100);
-    }                       // loop until connected or Wifi setup menu is exited.
-    delay(2000);            // give smartConfig time to send provision status back to the users phone.
-        
-    if (WiFi.status() == WL_CONNECTED) {
-        _LOG_V("\nWiFi Connected, IP Address:%s.\n", WiFi.localIP().toString().c_str());
-        WIFImode = 1;                                                           // we are already connected so don't call handleWIFImode
-    } else {
-        _LOG_V("\nCould not connect to WiFi, giving up.\n");
-        WIFImode = 0;
-        handleWIFImode();
-    }
-    write_settings();
-    CliState= 0;
-#ifndef SENSORBOX_VERSION                                                       //so we are not on a sensorbox but on a smartevse
-#if SMARTEVSE_VERSION >=30
-    LCDNav = 0;
-#endif
-#else
-    s.end();
-    if (s == Serial2) {
-        Serial2.setRxBufferSize(2048);                                                // Important! first increase buffer, then setup Uart2
-        Serial2.begin(115200, SERIAL_8N1, PIN_RX, -1, true);
-        Serial.begin(115200, SERIAL_8N1, PIN_PGD, PIN_TXD, false);
-    } else
-        s.begin(115200, SERIAL_8N1, PIN_PGD, PIN_TXD, false);                    // Input from TX of PIC, and debug output to USB
-#endif
-    WiFi.stopSmartConfig(); // this makes sure repeated SmartConfig calls are succesfull
-    vTaskDelete(NULL);                                                          //end this task so it will not take up resources
-}
-
-
 void handleWIFImode(void *s) {
     if (WIFImode == 2 && WiFi.getMode() != WIFI_AP_STA) {
-        //now start the portal in the background, so other tasks keep running
-        xTaskCreate(
-            SetupPortalTask,     // Function that should be called
-            "SetupPortalTask",   // Name of the task (for debugging)
-            10000,                // Stack size (bytes)                              // printf needs atleast 1kb
-            (void *) &s,          // Parameter: which serial interface to use for ProvisionCli
-            3,                    // Task priority - medium
-            NULL                  // Task handleCTReceive
-        );
+        _LOG_A("Start Portal...\n");
+
+        // set random AP password
+        uint8_t i, c;
+        for (i=0; i<8 ;i++) {
+                c = random(16) + '0';
+                if (c > '9') c += 'a'-'9'-1;
+                APpassword[i] = c;
+        }
+
+        // Start WiFi as AP
+        WiFi.softAP("SmartEVSE-config", APpassword);
+        IPAddress IP = WiFi.softAPIP();
+
+        if (!HttpListener80) {
+            HttpListener80 = mg_http_listen(&mgr, "http://0.0.0.0:80", fn_http_server, NULL);  // Setup listener
+        }
+        if (!HttpListener443) {
+            HttpListener443 = mg_http_listen(&mgr, "http://0.0.0.0:443", fn_http_server, (void *) 1);  // Setup listener
+        }
+        _LOG_A("HTTP server started\n");
     }
 
     if (WIFImode == 1 && WiFi.getMode() == WIFI_OFF) {
@@ -1525,15 +1426,6 @@ void WiFiSetup(void) {
     //WiFi.persistent(true);
     WiFi.onEvent(onWifiEvent);
 
-
-    // Set random AES Key for SmartConfig provisioning, first 8 positions are 0
-    // This key is displayed on the LCD, and should be entered when using the EspTouch app.
-#ifndef SENSORBOX_VERSION
-    for (uint8_t i=0; i<8 ;i++) {
-        SmartConfigKey[i+8] = random(9) + '1';
-    }
-#endif
-
     if (preferences.begin("settings", false) ) {
         TZinfo = preferences.getString("TimezoneInfo","");
         if (TZinfo != "") {

docs/configuration.md

@@ -133,9 +133,9 @@ Enable Wifi connection to your network.
 
 - **Disabled**: Wifi connection is disabled.
 - **SetupWifi** 
-  - v3.6.3 or older:  
-  The SmartEVSE presents itself as a Wifi Acces Point with SSID "smartevse-xxxx". Connect with your phone to that access point, go to [http://192.168.4.1/](http://192.168.4.1/) and configure your Wifi SSID and key (password).
-  - v.3.6.4 and newer:
+  - v3.9.0 or newer:
+  The SmartEVSE presents itself as a Wifi Acces Point with SSID "SmartEVSE-config"; the password is displayed at the top line of your LCD display. Connect with your phone to that access point, go to [http://192.168.4.1/](http://192.168.4.1/) and configure your Wifi SSID and password.
+  - v3.6.4 until v3.8.x:
     - Connect your smartphone to the wifi network you want your SmartEVSE connected to.
 Note: If you have a multi AP setup, with the same SSID, you need to be connected to the desired AP, as the configuration is based on the BSSID, so it will choos the specific AP your phone is connected to.
     - Download and run the ESPTouch app from your favorite app store [Android](https://play.google.com/store/apps/details?id=com.fyent.esptouch.android&hl=en_US:) (please ignore the strange Author name) or [Apple](https://apps.apple.com/us/app/espressif-esptouch/id1071176700) or  [Github](https://github.com/EspressifApp/EsptouchForAndroid) (for source code).
@@ -150,7 +150,7 @@ Note: If you have a multi AP setup, with the same SSID, you need to be connected
     - Press **Confirm**, within 30 seconds the app will confirm a MAC address and an IP address.
     - You are connected now. If you want special stuff (static IP address, special DNS address), configure them on your AP/router.
 
-  - v3.6.4 and newer BACKUP PROCEDURE: if you don't get it to work with the ESPTouch app, there is a backup procedure:
+  - v3.6.4 and until v3.8.x: BACKUP PROCEDURE: if you don't get it to work with the ESPTouch app, there is a backup procedure:
     - connect your SmartEVSE with a USB cable to your PC
     - install the USB driver (Windows) or not (Linux) for ESP32 chipset
     - connect your favorite serial terminal to the appropriate port,
@@ -163,6 +163,8 @@ Note: If you have a multi AP setup, with the same SSID, you need to be connected
     - press the middle button to start the configuration procedure
     - on your terminal window you should see a request to enter your WiFi access point SSID and password. 
     - the controller should now connect to WiFi.
+  - v3.6.3 or older:
+  The SmartEVSE presents itself as a Wifi Acces Point with SSID "smartevse-xxxx". Connect with your phone to that access point, go to [http://192.168.4.1/](http://192.168.4.1/) and configure your Wifi SSID and key (password).
 - **Enabled**: Connect to your network via Wifi.
 
 ## AUTOUPDAT