From 35ae292f1ddc2936845befb1781f17101cdd2ed8 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Sun, 5 Nov 2023 14:55:19 -1000
Subject: [PATCH 1/4] Update/upgrade OTAWebUpdater.ino example

---
 .../examples/OTAWebUpdater/OTAWebUpdater.ino  | 169 ------------------
 .../examples/OTAWebUpdater/.skip.esp32h2      |   0
 .../examples/OTAWebUpdater/OTAWebUpdater.ino  | 102 +++++++++++
 .../Update/examples/OTAWebUpdater/html.h      | 110 ++++++++++++
 4 files changed, 212 insertions(+), 169 deletions(-)
 delete mode 100644 libraries/ArduinoOTA/examples/OTAWebUpdater/OTAWebUpdater.ino
 rename libraries/{ArduinoOTA => Update}/examples/OTAWebUpdater/.skip.esp32h2 (100%)
 create mode 100644 libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
 create mode 100644 libraries/Update/examples/OTAWebUpdater/html.h

diff --git a/libraries/ArduinoOTA/examples/OTAWebUpdater/OTAWebUpdater.ino b/libraries/ArduinoOTA/examples/OTAWebUpdater/OTAWebUpdater.ino
deleted file mode 100644
index 4c4adc7fe87..00000000000
--- a/libraries/ArduinoOTA/examples/OTAWebUpdater/OTAWebUpdater.ino
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <WiFi.h>
-#include <WiFiClient.h>
-#include <WebServer.h>
-#include <ESPmDNS.h>
-#include <Update.h>
-
-const char* host = "esp32";
-const char* ssid = "xxx";
-const char* password = "xxxx";
-
-WebServer server(80);
-
-/*
- * Login page
- */
-
-const char* loginIndex =
- "<form name='loginForm'>"
-    "<table width='20%' bgcolor='A09F9F' align='center'>"
-        "<tr>"
-            "<td colspan=2>"
-                "<center><font size=4><b>ESP32 Login Page</b></font></center>"
-                "<br>"
-            "</td>"
-            "<br>"
-            "<br>"
-        "</tr>"
-        "<tr>"
-             "<td>Username:</td>"
-             "<td><input type='text' size=25 name='userid'><br></td>"
-        "</tr>"
-        "<br>"
-        "<br>"
-        "<tr>"
-            "<td>Password:</td>"
-            "<td><input type='Password' size=25 name='pwd'><br></td>"
-            "<br>"
-            "<br>"
-        "</tr>"
-        "<tr>"
-            "<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
-        "</tr>"
-    "</table>"
-"</form>"
-"<script>"
-    "function check(form)"
-    "{"
-    "if(form.userid.value=='admin' && form.pwd.value=='admin')"
-    "{"
-    "window.open('/serverIndex')"
-    "}"
-    "else"
-    "{"
-    " alert('Error Password or Username')/*displays error message*/"
-    "}"
-    "}"
-"</script>";
-
-/*
- * Server Index Page
- */
-
-const char* serverIndex =
-"<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>"
-"<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>"
-   "<input type='file' name='update'>"
-        "<input type='submit' value='Update'>"
-    "</form>"
- "<div id='prg'>progress: 0%</div>"
- "<script>"
-  "$('form').submit(function(e){"
-  "e.preventDefault();"
-  "var form = $('#upload_form')[0];"
-  "var data = new FormData(form);"
-  " $.ajax({"
-  "url: '/update',"
-  "type: 'POST',"
-  "data: data,"
-  "contentType: false,"
-  "processData:false,"
-  "xhr: function() {"
-  "var xhr = new window.XMLHttpRequest();"
-  "xhr.upload.addEventListener('progress', function(evt) {"
-  "if (evt.lengthComputable) {"
-  "var per = evt.loaded / evt.total;"
-  "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
-  "}"
-  "}, false);"
-  "return xhr;"
-  "},"
-  "success:function(d, s) {"
-  "console.log('success!')"
- "},"
- "error: function (a, b, c) {"
- "}"
- "});"
- "});"
- "</script>";
-
-/*
- * setup function
- */
-void setup(void) {
-  Serial.begin(115200);
-
-  // Connect to WiFi network
-  WiFi.begin(ssid, password);
-  Serial.println("");
-
-  // Wait for connection
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-  Serial.println("");
-  Serial.print("Connected to ");
-  Serial.println(ssid);
-  Serial.print("IP address: ");
-  Serial.println(WiFi.localIP());
-
-  /*use mdns for host name resolution*/
-  if (!MDNS.begin(host)) { //http://esp32.local
-    Serial.println("Error setting up MDNS responder!");
-    while (1) {
-      delay(1000);
-    }
-  }
-  Serial.println("mDNS responder started");
-  /*return index page which is stored in serverIndex */
-  server.on("/", HTTP_GET, []() {
-    server.sendHeader("Connection", "close");
-    server.send(200, "text/html", loginIndex);
-  });
-  server.on("/serverIndex", HTTP_GET, []() {
-    server.sendHeader("Connection", "close");
-    server.send(200, "text/html", serverIndex);
-  });
-  /*handling uploading firmware file */
-  server.on("/update", HTTP_POST, []() {
-    server.sendHeader("Connection", "close");
-    server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
-    ESP.restart();
-  }, []() {
-    HTTPUpload& upload = server.upload();
-    if (upload.status == UPLOAD_FILE_START) {
-      Serial.printf("Update: %s\n", upload.filename.c_str());
-      if (!Update.begin(UPDATE_SIZE_UNKNOWN)) { //start with max available size
-        Update.printError(Serial);
-      }
-    } else if (upload.status == UPLOAD_FILE_WRITE) {
-      /* flashing firmware to ESP*/
-      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
-        Update.printError(Serial);
-      }
-    } else if (upload.status == UPLOAD_FILE_END) {
-      if (Update.end(true)) { //true to set the size to the current progress
-        Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
-      } else {
-        Update.printError(Serial);
-      }
-    }
-  });
-  server.begin();
-}
-
-void loop(void) {
-  server.handleClient();
-  delay(1);
-}
diff --git a/libraries/ArduinoOTA/examples/OTAWebUpdater/.skip.esp32h2 b/libraries/Update/examples/OTAWebUpdater/.skip.esp32h2
similarity index 100%
rename from libraries/ArduinoOTA/examples/OTAWebUpdater/.skip.esp32h2
rename to libraries/Update/examples/OTAWebUpdater/.skip.esp32h2
diff --git a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
new file mode 100644
index 00000000000..e3edff67108
--- /dev/null
+++ b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
@@ -0,0 +1,102 @@
+#include <WiFi.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+#include <Update.h>
+#include <Ticker.h>
+#include "html.h"
+
+#define SSID_FORMAT "ESP32-%06X"   // 12 chars total
+//#define PASSWORD "test123456"    // generate if remarked
+
+WebServer server(80);
+Ticker tkSecond;
+uint8_t otaDone = 0;
+
+const char* alphanum = "0123456789!@#$%^&*abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+String generatePass(uint8_t str_len) {
+  String buff;
+  for(int i = 0; i < str_len; i++)
+    buff += alphanum[random(strlen(alphanum)-1)];
+  return buff;
+}
+
+void apMode() {
+  WiFi.mode(WIFI_AP);
+  char ssid[13];
+  char passwd[11];
+  uint32_t espmac = ESP.getEfuseMac() & 0xFFFFFF;
+  snprintf(ssid, 13, SSID_FORMAT, espmac);
+#ifdef PASSWORD
+  snprintf(passwd, 11, PASSWORD);
+#else
+  snprintf(passwd, 11, "%s", generatePass(10).c_str());
+#endif   
+  WiFi.softAP(ssid, passwd); // Set up the SoftAP
+  MDNS.begin("esp32");
+  Serial.printf("AP: %s, PASS: %s\n", ssid, passwd);
+}
+
+void handleUpdateEnd() {
+  server.sendHeader("Connection", "close");
+  if (Update.hasError()) {
+    server.send(502, "text/plain", Update.errorString());
+  } else {
+    server.sendHeader("Refresh", "10");
+    server.sendHeader("Location","/");
+    server.send(307);
+    ESP.restart();
+  }
+}
+
+void handleUpdate() {
+  size_t fsize = UPDATE_SIZE_UNKNOWN;
+  if (server.hasArg("size")) fsize = server.arg("size").toInt();
+  HTTPUpload& upload = server.upload();
+  if (upload.status == UPLOAD_FILE_START) {
+    Serial.printf("Receiving Update: %s, Size: %d\n", upload.filename.c_str(), fsize);
+    if (!Update.begin(fsize)) {
+      otaDone = 0;
+      Update.printError(Serial);
+    }
+  } else if (upload.status == UPLOAD_FILE_WRITE) {
+    if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+      Update.printError(Serial);
+    } else {
+      otaDone = 100 * Update.progress() / Update.size();
+    }
+  } else if (upload.status == UPLOAD_FILE_END) {
+    if (Update.end(true)) {
+      Serial.printf("Update Success: %u bytes\nRebooting...\n", upload.totalSize);
+    } else {
+      Serial.printf("%s\n", Update.errorString());
+      otaDone = 0;
+    }
+  }
+}
+
+void webServerInit() {
+  server.on("/update", HTTP_POST, [](){handleUpdateEnd();}, [](){handleUpdate();});
+  server.on("/favicon.ico", HTTP_GET, [](){
+     server.sendHeader("Content-Encoding", "gzip");
+     server.send_P(200, "image/x-icon", favicon_ico_gz, favicon_ico_gz_len);
+  });
+  server.onNotFound([]() {server.send(200, "text/html", indexHtml);});
+  server.begin();
+  Serial.printf("Web Server ready at http://esp32.local or http://%s\n", WiFi.softAPIP().toString());
+}
+
+void everySecond() {
+  if (otaDone > 1) Serial.printf("ota: %d%%\n", otaDone);  
+}
+
+void setup() {
+  Serial.begin(115200);
+  apMode();
+  webServerInit();
+  tkSecond.attach(1, everySecond);
+}
+
+void loop() {
+  delay(150);
+  server.handleClient();
+}
diff --git a/libraries/Update/examples/OTAWebUpdater/html.h b/libraries/Update/examples/OTAWebUpdater/html.h
new file mode 100644
index 00000000000..9a100e69357
--- /dev/null
+++ b/libraries/Update/examples/OTAWebUpdater/html.h
@@ -0,0 +1,110 @@
+// Literal string
+const char* indexHtml = R"literal(
+  <!DOCTYPE html>
+  <link rel='icon' href='/favicon.ico' sizes='any'>
+  <body style='width:480px'>
+    <h2>ESP Firmware Update</h2>
+    <form method='POST' enctype='multipart/form-data' id='upload-form'>
+      <input type='file' id='file' name='update'>
+      <input type='submit' value='Update'>
+    </form>
+    <br>
+    <div id='prg' style='width:0;color:white;text-align:center'>0%</div>
+  </body>
+  <script>
+    var prg = document.getElementById('prg');
+    var form = document.getElementById('upload-form');
+    form.addEventListener('submit', el=>{
+      prg.style.backgroundColor = 'blue'; 
+      el.preventDefault();
+      var data = new FormData(form);
+      var req = new XMLHttpRequest();
+      var fsize = document.getElementById('file').files[0].size;
+      req.open('POST', '/update?size=' + fsize);  
+      req.upload.addEventListener('progress', p=>{
+        let w = Math.round(p.loaded/p.total*100) + '%';
+          if(p.lengthComputable){
+             prg.innerHTML = w;
+             prg.style.width = w;
+          }
+          if(w == '100%') prg.style.backgroundColor = 'black'; 
+      });
+      req.send(data);
+     });
+  </script>
+)literal";
+
+// Compressed gzip in C include file style
+// listing was created using `xxd -i favicon.ico.gz`
+const char favicon_ico_gz[] = {
+  0x1f, 0x8b, 0x08, 0x08, 0x13, 0xb6, 0xa5, 0x62, 0x00, 0x03, 0x66, 0x61,
+  0x76, 0x69, 0x63, 0x6f, 0x6e, 0x2e, 0x69, 0x63, 0x6f, 0x00, 0xa5, 0x53,
+  0x69, 0x48, 0x54, 0x51, 0x14, 0x7e, 0x41, 0x99, 0x4b, 0xa0, 0x15, 0x24,
+  0xb4, 0x99, 0x8e, 0x1b, 0x25, 0xa8, 0x54, 0xb4, 0x19, 0x56, 0x62, 0x41,
+  0xab, 0x14, 0x45, 0x61, 0x51, 0x62, 0x86, 0x69, 0x1a, 0xd4, 0x60, 0xda,
+  0xa2, 0x99, 0x4b, 0x69, 0x1b, 0x42, 0x26, 0x5a, 0x09, 0x59, 0xd8, 0xfe,
+  0xab, 0x88, 0xa0, 0x82, 0xe8, 0x4f, 0x90, 0xa5, 0x14, 0x68, 0x0b, 0xe6,
+  0x2c, 0x6f, 0x9c, 0xed, 0xcd, 0x9b, 0xcd, 0x19, 0x9d, 0x99, 0x3b, 0xe3,
+  0xd7, 0x79, 0x6f, 0x34, 0xac, 0xe8, 0x57, 0xf7, 0x72, 0x1e, 0x87, 0xb3,
+  0xbe, 0xf3, 0x9d, 0xef, 0x72, 0xdc, 0x24, 0xba, 0x51, 0x51, 0x1c, 0x7d,
+  0x17, 0x70, 0x85, 0x93, 0x39, 0x6e, 0x16, 0xc7, 0x71, 0xc9, 0x24, 0x64,
+  0x22, 0x4b, 0xd0, 0x2e, 0x1f, 0xf2, 0xcd, 0x8c, 0x08, 0xca, 0xf8, 0x89,
+  0x48, 0x54, 0x7b, 0x49, 0xd8, 0xb8, 0x84, 0xc6, 0xab, 0xd9, 0xd4, 0x58,
+  0x15, 0x8b, 0x4e, 0xd1, 0xb0, 0xa4, 0x0c, 0x9e, 0x2d, 0x5a, 0xa3, 0x63,
+  0x31, 0x4b, 0xb4, 0x6c, 0x9a, 0x22, 0x68, 0x0f, 0x9f, 0x10, 0x3b, 0x21,
+  0x17, 0x92, 0x84, 0xc5, 0xa9, 0x90, 0xbc, 0x8a, 0x47, 0xe1, 0x31, 0x01,
+  0x95, 0xf5, 0x22, 0x6a, 0x1a, 0xac, 0x28, 0x3f, 0x2b, 0xa2, 0x8a, 0x74,
+  0xe5, 0x19, 0x0b, 0xb2, 0xb7, 0xeb, 0x11, 0x49, 0x71, 0xe1, 0x09, 0xc1,
+  0xf8, 0x09, 0x75, 0x10, 0xae, 0x50, 0x61, 0xf3, 0x6e, 0x03, 0x2a, 0xeb,
+  0x44, 0xe4, 0xec, 0x31, 0xa0, 0xf9, 0x86, 0x1d, 0xb7, 0x3b, 0x9d, 0x58,
+  0x9e, 0xa5, 0xc3, 0xb5, 0x1b, 0x0e, 0xd4, 0x5f, 0xb4, 0xe2, 0xa8, 0x52,
+  0xc0, 0xf1, 0x53, 0x16, 0xcc, 0x49, 0xd3, 0x8c, 0xd7, 0x90, 0xf3, 0xa5,
+  0xbe, 0xdb, 0x72, 0x0d, 0x78, 0xff, 0x71, 0x04, 0x77, 0x1f, 0x3a, 0x91,
+  0x9e, 0xc9, 0xe3, 0xed, 0xbb, 0x61, 0xb8, 0x87, 0x03, 0x28, 0x56, 0x9a,
+  0xc1, 0x0f, 0x32, 0xf4, 0x7d, 0xf5, 0x42, 0x91, 0xaa, 0xc1, 0xba, 0x6d,
+  0x7a, 0xc4, 0xaf, 0xe0, 0x11, 0x16, 0x1f, 0xcc, 0x0f, 0xa5, 0xb9, 0x16,
+  0xae, 0xe6, 0x51, 0x7b, 0xc9, 0x8a, 0x17, 0xaf, 0xdd, 0x18, 0xf1, 0x04,
+  0xb0, 0x65, 0x97, 0x01, 0x1d, 0xf7, 0x9c, 0xf0, 0xfb, 0x03, 0x28, 0x2a,
+  0x13, 0xd0, 0xfb, 0xcd, 0x8b, 0xfe, 0x1f, 0x5e, 0x1c, 0x38, 0x6c, 0xc2,
+  0xe3, 0xa7, 0x2e, 0x2c, 0xcd, 0x1e, 0x44, 0x98, 0x62, 0x2c, 0x9f, 0x30,
+  0x39, 0x52, 0x6e, 0x41, 0xe6, 0x56, 0x3d, 0x16, 0x65, 0xf0, 0xd8, 0xb9,
+  0xd7, 0x88, 0x0d, 0x39, 0x7a, 0x0c, 0xa8, 0x7d, 0x30, 0x99, 0x19, 0x0e,
+  0x95, 0x9a, 0x60, 0xb6, 0x30, 0x74, 0xf5, 0x8c, 0xa0, 0xbc, 0x52, 0xc0,
+  0x28, 0xdd, 0xcb, 0xd7, 0xed, 0x20, 0x2c, 0xe5, 0xfc, 0xd9, 0xa9, 0x1a,
+  0x56, 0xdd, 0x68, 0x45, 0x5c, 0xba, 0x16, 0xf9, 0xa5, 0x66, 0xb4, 0xdd,
+  0x72, 0xa0, 0x7f, 0xc0, 0x0b, 0x50, 0x5c, 0x6b, 0xbb, 0x1d, 0xf5, 0x97,
+  0xad, 0xb2, 0x7e, 0xb3, 0xc3, 0x81, 0x96, 0x5b, 0x76, 0x59, 0x3f, 0x5e,
+  0x69, 0xc1, 0xe4, 0x98, 0x60, 0x7e, 0x0a, 0xed, 0xe7, 0xd4, 0x39, 0x11,
+  0xe7, 0x29, 0x8e, 0xb1, 0x00, 0x46, 0x47, 0x47, 0x21, 0x50, 0xbf, 0x36,
+  0xca, 0x2d, 0x2c, 0x31, 0x41, 0x6f, 0x64, 0xb0, 0x88, 0x0c, 0x05, 0xa4,
+  0x7f, 0xa1, 0x39, 0x2c, 0x56, 0x3f, 0x76, 0xec, 0x37, 0x22, 0x76, 0x99,
+  0x56, 0xc2, 0x80, 0xa5, 0xad, 0xd5, 0xb1, 0x33, 0x84, 0x79, 0x17, 0x61,
+  0xe7, 0x72, 0xfb, 0x71, 0xe1, 0x8a, 0x0d, 0x07, 0x8b, 0x4d, 0xa8, 0x6d,
+  0x14, 0xa1, 0x1b, 0xf4, 0xc1, 0x47, 0x35, 0xa5, 0xda, 0x4d, 0x2d, 0x36,
+  0xb9, 0xf7, 0xfd, 0x27, 0x4e, 0xd4, 0xd2, 0x2e, 0xf6, 0x15, 0x99, 0x11,
+  0x12, 0xa3, 0x62, 0x8a, 0xe5, 0x3c, 0xab, 0x23, 0xff, 0xb3, 0x17, 0x2e,
+  0xb9, 0xf7, 0xf7, 0x7e, 0x2f, 0x0c, 0x26, 0x26, 0xeb, 0x16, 0x91, 0xea,
+  0x91, 0xaf, 0x82, 0x76, 0xef, 0x1c, 0xf2, 0x43, 0xab, 0xf3, 0xc9, 0xb5,
+  0xbb, 0xba, 0x3d, 0x58, 0x4f, 0x18, 0x87, 0xc4, 0xaa, 0x59, 0x64, 0x82,
+  0x9a, 0x9d, 0xac, 0x15, 0x91, 0x9b, 0x6f, 0xc4, 0xab, 0x37, 0xc3, 0x50,
+  0x6b, 0x7c, 0xe8, 0xfe, 0x34, 0x82, 0xf6, 0x3b, 0x0e, 0x14, 0x50, 0xec,
+  0xd5, 0x6b, 0x36, 0x38, 0x9c, 0x7e, 0xd8, 0x1c, 0x7e, 0x28, 0x4f, 0x0a,
+  0xe8, 0x7c, 0xe4, 0xc4, 0xc7, 0x4f, 0x1e, 0xcc, 0x25, 0x0e, 0x84, 0x25,
+  0x04, 0x39, 0xb9, 0x25, 0xd7, 0x88, 0xfc, 0x12, 0x33, 0xa2, 0x93, 0xd5,
+  0xc8, 0x2b, 0x32, 0xe1, 0xc4, 0x69, 0x01, 0xcd, 0xad, 0x76, 0xf4, 0xf6,
+  0x79, 0xe4, 0xff, 0xe0, 0xa9, 0xaf, 0xb2, 0x42, 0x40, 0x53, 0xb3, 0x0d,
+  0x43, 0x2e, 0xe2, 0x04, 0xed, 0x34, 0x74, 0x0c, 0x7f, 0xe2, 0x11, 0x9b,
+  0x4e, 0x79, 0xe5, 0xd5, 0x22, 0xb2, 0x88, 0x1b, 0xcf, 0x5f, 0xba, 0xe5,
+  0x39, 0x25, 0x11, 0x09, 0xab, 0x07, 0x34, 0xef, 0x41, 0xda, 0xfb, 0x3d,
+  0xea, 0xeb, 0x72, 0x07, 0x70, 0xf5, 0xba, 0x0d, 0x33, 0x92, 0xd5, 0xbf,
+  0xf3, 0x8f, 0xb8, 0x34, 0x7f, 0xb1, 0x16, 0x89, 0x2b, 0x79, 0x64, 0x6c,
+  0x1a, 0x44, 0x53, 0x9b, 0x1d, 0x65, 0x55, 0x22, 0x76, 0x12, 0xce, 0x35,
+  0x0d, 0x22, 0x3e, 0xf4, 0x78, 0xd0, 0xfd, 0xd9, 0x43, 0x5c, 0x14, 0x30,
+  0x23, 0xe9, 0x1f, 0xfc, 0x27, 0x9b, 0x54, 0x87, 0xf8, 0x28, 0xff, 0xdb,
+  0x94, 0xf9, 0x2a, 0x24, 0x10, 0x4f, 0xf3, 0x68, 0xae, 0x8d, 0xf4, 0x1e,
+  0xe6, 0x11, 0x3f, 0x24, 0x7b, 0x78, 0xe2, 0xaf, 0x5c, 0xfc, 0xf1, 0x06,
+  0xff, 0x12, 0x69, 0xbf, 0x53, 0x68, 0x47, 0x21, 0x84, 0x91, 0xa4, 0x4f,
+  0xf4, 0x8d, 0xbd, 0x63, 0x2f, 0xf7, 0x9f, 0xe7, 0x27, 0x40, 0xbb, 0x5a,
+  0x53, 0x7e, 0x04, 0x00, 0x00
+};
+const int favicon_ico_gz_len = 821;

From 8430373427f3c34818105b5886e44b6232c546c0 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Mon, 6 Nov 2023 09:59:51 -1000
Subject: [PATCH 2/4] Wrong side of the MAC address in ssid

---
 libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
index e3edff67108..9ae5bd531b9 100644
--- a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
+++ b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
@@ -24,7 +24,7 @@ void apMode() {
   WiFi.mode(WIFI_AP);
   char ssid[13];
   char passwd[11];
-  uint32_t espmac = ESP.getEfuseMac() & 0xFFFFFF;
+  uint32_t espmac = ESP.getEfuseMac() >> 16; 
   snprintf(ssid, 13, SSID_FORMAT, espmac);
 #ifdef PASSWORD
   snprintf(passwd, 11, PASSWORD);

From c8c3f23f870a4d91191a400b6802726a5fa0adf0 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Mon, 6 Nov 2023 10:15:46 -1000
Subject: [PATCH 3/4] Better not to cheat it on an example :)

---
 libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
index 9ae5bd531b9..d3ad7511390 100644
--- a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
+++ b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
@@ -24,7 +24,7 @@ void apMode() {
   WiFi.mode(WIFI_AP);
   char ssid[13];
   char passwd[11];
-  uint32_t espmac = ESP.getEfuseMac() >> 16; 
+  uint32_t espmac = ESP.getEfuseMac() >> 24; 
   snprintf(ssid, 13, SSID_FORMAT, espmac);
 #ifdef PASSWORD
   snprintf(passwd, 11, PASSWORD);

From 524fc4af6c5b91a2401ef00428468c0386e9f837 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Thu, 9 Nov 2023 11:05:10 -1000
Subject: [PATCH 4/4] Changes requested by @me-no-dev

---
 .../Update/examples/OTAWebUpdater/OTAWebUpdater.ino    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
index d3ad7511390..27e4ac6d95f 100644
--- a/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
+++ b/libraries/Update/examples/OTAWebUpdater/OTAWebUpdater.ino
@@ -5,7 +5,7 @@
 #include <Ticker.h>
 #include "html.h"
 
-#define SSID_FORMAT "ESP32-%06X"   // 12 chars total
+#define SSID_FORMAT "ESP32-%06lX"   // 12 chars total
 //#define PASSWORD "test123456"    // generate if remarked
 
 WebServer server(80);
@@ -21,16 +21,16 @@ String generatePass(uint8_t str_len) {
 }
 
 void apMode() {
-  WiFi.mode(WIFI_AP);
   char ssid[13];
   char passwd[11];
-  uint32_t espmac = ESP.getEfuseMac() >> 24; 
+  long unsigned int espmac = ESP.getEfuseMac() >> 24; 
   snprintf(ssid, 13, SSID_FORMAT, espmac);
 #ifdef PASSWORD
   snprintf(passwd, 11, PASSWORD);
 #else
-  snprintf(passwd, 11, "%s", generatePass(10).c_str());
+  snprintf(passwd, 11, generatePass(10).c_str());
 #endif   
+  WiFi.mode(WIFI_AP);
   WiFi.softAP(ssid, passwd); // Set up the SoftAP
   MDNS.begin("esp32");
   Serial.printf("AP: %s, PASS: %s\n", ssid, passwd);
@@ -82,7 +82,7 @@ void webServerInit() {
   });
   server.onNotFound([]() {server.send(200, "text/html", indexHtml);});
   server.begin();
-  Serial.printf("Web Server ready at http://esp32.local or http://%s\n", WiFi.softAPIP().toString());
+  Serial.printf("Web Server ready at http://esp32.local or http://%s\n", WiFi.softAPIP().toString().c_str());
 }
 
 void everySecond() {