diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4d1b42849fb2e458deede84b51e5820e0ac1a23d..a9eb87fc066fc14bc2f065b07c8daa933dd8a613 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,10 +2,17 @@
# neOCampus operation
# (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT
-=== Release 220815 / feature-SDKupgrade
+=== Release 230116 / feature-SDKupgrade
Bumps to esp32 2.0.6
Bumps to esp8266 3.1.0
-- to be continued
+- force 802.11b for both ESP8266 and ESP32 --> solved our DHCP issues :D
+- WARNING: breaks SPIFFS format@ESP32 ==> reformat @ reboot ==> per device setup :'(
+ no SPIFFS format change @ ESP8266
+- WiFiManager 2.0.15-rc1 no debug --> revert to 2.0.14-beta
+- newer WiFiManager introduces ASYNC SCAN ==> very slow (almost unanswered)
+[esp32]
+- recompiled lwip for NTP server support from DHCP answer (IDF 4.4.3)
+
=== Release 220815 / feature-SDKupgrade
Bumps to esp32 2.0.4
diff --git a/README.md b/README.md
index e4d18595f6f9a48cffb8fbeee592fd837399cede..927995299fed350461156251b7b5d66caa8b4978 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,10 @@ The board features four specific sensors able to measure NO2, CO, CH20, NO2 alte
## Getting started ##
First of all, you ought to install esp32, esp8266 or CubeCell support in your Arduino IDE.
-| Device | Release | Arduino Board Manager json file |
-|----------|---------|------------------------------------------------------------------------------------------------------------|
-| esp8266 | 3.0.2 | https://arduino.esp8266.com/stable/package_esp8266com_index.json |
-| esp32 | 2.0.4 | https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json |
+| Device | Release | Arduino Board Manager json file |
+|----------|-----------|------------------------------------------------------------------------------------------------------------|
+| esp8266 | 3.10.0 | https://arduino.esp8266.com/stable/package_esp8266com_index.json |
+| esp32 | 2.0.6 | https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json |
| CubeCell | *latest* | https://github.com/HelTecAutomation/CubeCell-Arduino/releases/download/V1.3.0/package_CubeCell_index.json |
| stm32 | *latest* | https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json |
diff --git a/neosensor/libraries/WiFiManager/README.md b/neosensor/libraries/WiFiManager/README.md
index 75c82c3b71473566a3ae1c83c2d0236b0cfa9640..a5c912a96b94dcf26dbd1e93622a32557b6d56c7 100644
--- a/neosensor/libraries/WiFiManager/README.md
+++ b/neosensor/libraries/WiFiManager/README.md
@@ -1,5 +1,6 @@
# WiFiManager
+## DEVELOPMENT Version
Espressif ESPx WiFi Connection manager with fallback web configuration portal
diff --git a/neosensor/libraries/WiFiManager/WiFiManager.cpp b/neosensor/libraries/WiFiManager/WiFiManager.cpp
index 0a4af8a3a09bc927abaa3c2c91a6bc728bbebf40..edd1ed3ad2fca1c83280b342df05cf6aee16e38a 100644
--- a/neosensor/libraries/WiFiManager/WiFiManager.cpp
+++ b/neosensor/libraries/WiFiManager/WiFiManager.cpp
@@ -88,7 +88,7 @@ void WiFiManagerParameter::setValue(const char *defaultValue, int length) {
// // return false; //@todo bail
// }
- if(_length != length || _value == nullptr){
+ if(_length != length){
_length = length;
if( _value != nullptr){
delete[] _value;
diff --git a/neosensor/libraries/WiFiManager/WiFiManager.h b/neosensor/libraries/WiFiManager/WiFiManager.h
index 641b98928a4c17863b62438451e6e707cd335d5c..02286e4763e75393f80a8187a26ff8fc2c451ed8 100644
--- a/neosensor/libraries/WiFiManager/WiFiManager.h
+++ b/neosensor/libraries/WiFiManager/WiFiManager.h
@@ -131,19 +131,13 @@
#include <DNSServer.h>
#include <memory>
-
-
-// Include wm strings vars
-// Pass in strings env override via WM_STRINGS_FILE
-#ifndef WM_STRINGS_FILE
-#define WM_STRINGS_FILE "wm_strings_en.h" // this includes constants as dependency
-#endif
-#include WM_STRINGS_FILE
+#include "strings_en.h"
// prep string concat vars
#define WM_STRING2(x) #x
#define WM_STRING(x) WM_STRING2(x)
+
// #include <esp_idf_version.h>
#ifdef ESP_IDF_VERSION
// #pragma message "ESP_IDF_VERSION_MAJOR = " WM_STRING(ESP_IDF_VERSION_MAJOR)
@@ -770,7 +764,7 @@ class WiFiManager
// Set default debug level
#ifndef WM_DEBUG_LEVEL
- #define WM_DEBUG_LEVEL DEBUG_NOTIFY
+ #define WM_DEBUG_LEVEL DEBUG_VERBOSE // development default, not release
#endif
// override debug level OFF
@@ -781,7 +775,7 @@ class WiFiManager
#ifdef WM_DEBUG_LEVEL
uint8_t _debugLevel = (uint8_t)WM_DEBUG_LEVEL;
#else
- uint8_t _debugLevel = 0; // default debug level
+ uint8_t _debugLevel = DEBUG_VERBOSE; // default debug level
#endif
// @todo use DEBUG_ESP_PORT ?
diff --git a/neosensor/libraries/WiFiManager/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino b/neosensor/libraries/WiFiManager/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
index 2546c6afbba7aaf334bc36d00a841a44cc473ff1..a648366f629c8c517292d9ae6013242a808ae6de 100644
--- a/neosensor/libraries/WiFiManager/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
+++ b/neosensor/libraries/WiFiManager/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino
@@ -105,10 +105,6 @@ void setup() {
Serial.println("[INFORMATION] TEST");
- // WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); // wifi_scan_method_t scanMethod
- // WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); // wifi_sort_method_t sortMethod - WIFI_CONNECT_AP_BY_SIGNAL,WIFI_CONNECT_AP_BY_SECURITY
- // WiFi.setMinSecurity(WIFI_AUTH_WPA2_PSK);
-
wm.setDebugOutput(true);
wm.debugPlatformInfo();
diff --git a/neosensor/libraries/WiFiManager/library.json b/neosensor/libraries/WiFiManager/library.json
index 6b92d24a6ad90a592c3c52b8daa86d33c9cfd85a..eaf4b5e3c03a3ad967b982fab0da351857c7a355 100644
--- a/neosensor/libraries/WiFiManager/library.json
+++ b/neosensor/libraries/WiFiManager/library.json
@@ -1,6 +1,6 @@
{
"name": "WiFiManager",
- "version": "2.0.15-rc.1",
+ "version": "2.0.14-beta",
"keywords": "wifi,wi-fi,esp,esp8266,esp32,espressif8266,espressif32,nodemcu,wemos,arduino",
"description": "WiFi Configuration manager with web configuration portal for ESP boards",
"authors":
diff --git a/neosensor/libraries/WiFiManager/library.properties b/neosensor/libraries/WiFiManager/library.properties
index d35882361eee7e95fdd2d92ca5e55efab70486b3..3dbc5f44e970ac7d6e39ad4972cf833bd26704f2 100644
--- a/neosensor/libraries/WiFiManager/library.properties
+++ b/neosensor/libraries/WiFiManager/library.properties
@@ -1,5 +1,5 @@
name=WiFiManager
-version=2.0.15-rc.1
+version=2.0.14-beta
author=tzapu
maintainer=tablatronix
sentence=WiFi Configuration manager with web configuration portal for Espressif ESPx boards, by tzapu
diff --git a/neosensor/libraries/WiFiManager/strings_en.h b/neosensor/libraries/WiFiManager/strings_en.h
index cabeb58ba3408c045e1139e019a4ae845a7d1c3e..5ea622ecfdd79bffd492cbd1536c8a0d7e28ffd7 100644
--- a/neosensor/libraries/WiFiManager/strings_en.h
+++ b/neosensor/libraries/WiFiManager/strings_en.h
@@ -1,15 +1,502 @@
/**
- * Contents of this file have moved to 2 new locations
- * wm_strings_nn.h
- * wm_consts_nn.h
+ * strings_en.h
+ * engligh strings for
+ * WiFiManager, a library for the ESP8266/Arduino platform
+ * for configuration of WiFi credentials using a Captive Portal
+ *
+ * @author Creator tzapu
+ * @author tablatronix
+ * @version 0.0.0
+ * @license MIT
*/
-#warning "This file is deprecated"
+#ifndef _WM_STRINGS_H_
+#define _WM_STRINGS_H_
-#ifndef _STRINGS_EN_H_
-#define _STRINGS_EN_H_
-// strings files must include a consts file!
-#include "wm_strings_en.h" // include constants, tokens, routes
+#ifndef WIFI_MANAGER_OVERRIDE_STRINGS
+// !!! ABOVE WILL NOT WORK if you define in your sketch, must be build flag, if anyone one knows how to order includes to be able to do this it would be neat.. I have seen it done..
-#endif
\ No newline at end of file
+const char WM_VERSION_STR[] PROGMEM = "v2.0.13-beta";
+
+const char HTTP_HEAD_START[] PROGMEM = "<!DOCTYPE html>"
+"<html lang='en'><head>"
+"<meta name='format-detection' content='telephone=no'>"
+"<meta charset='UTF-8'>"
+"<meta name='viewport' content='width=device-width,initial-scale=1,user-scalable=no'/>"
+"<title>{v}</title>";
+
+const char HTTP_SCRIPT[] PROGMEM = "<script>function c(l){"
+"document.getElementById('s').value=l.getAttribute('data-ssid')||l.innerText||l.textContent;"
+"p = l.nextElementSibling.classList.contains('l');"
+"document.getElementById('p').disabled = !p;"
+"if(p)document.getElementById('p').focus();};"
+"function f() {var x = document.getElementById('p');x.type==='password'?x.type='text':x.type='password';}"
+"</script>"; // @todo add button states, disable on click , show ack , spinner etc
+
+const char HTTP_HEAD_END[] PROGMEM = "</head><body class='{c}'><div class='wrap'>"; // {c} = _bodyclass
+// example of embedded logo, base64 encoded inline, No styling here
+// const char HTTP_ROOT_MAIN[] PROGMEM = "<img title=' alt=' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAADQElEQVRoQ+2YjW0VQQyE7Q6gAkgFkAogFUAqgFQAVACpAKiAUAFQAaECQgWECggVGH1PPrRvn3dv9/YkFOksoUhhfzwz9ngvKrc89JbnLxuA/63gpsCmwCADWwkNEji8fVNgotDM7osI/x777x5l9F6JyB8R4eeVql4P0y8yNsjM7KGIPBORp558T04A+CwiH1UVUItiUQmZ2XMReSEiAFgjAPBeVS96D+sCYGaUx4cFbLfmhSpnqnrZuqEJgJnd8cQplVLciAgX//Cf0ToIeOB9wpmloLQAwpnVmAXgdf6pwjpJIz+XNoeZQQZlODV9vhc1Tuf6owrAk/8qIhFbJH7eI3eEzsvydQEICqBEkZwiALfF70HyHPpqScPV5HFjeFu476SkRA0AzOfy4hYwstj2ZkDgaphE7m6XqnoS7Q0BOPs/sw0kDROzjdXcCMFCNwzIy0EcRcOvBACfh4k0wgOmBX4xjfmk4DKTS31hgNWIKBCI8gdzogTgjYjQWFMw+o9LzJoZ63GUmjWm2wGDc7EvDDOj/1IVMIyD9SUAL0WEhpriRlXv5je5S+U1i2N88zdPuoVkeB+ls4SyxCoP3kVm9jsjpEsBLoOBNC5U9SwpGdakFkviuFP1keblATkTENTYcxkzgxTKOI3jyDxqLkQT87pMA++H3XvJBYtsNbBN6vuXq5S737WqHkW1VgMQNXJ0RshMqbbT33sJ5kpHWymzcJjNTeJIymJZtSQd9NHQHS1vodoFoTMkfbJzpRnLzB2vi6BZAJxWaCr+62BC+jzAxVJb3dmmiLzLwZhZNPE5e880Suo2AZgB8e8idxherqUPnT3brBDTlPxO3Z66rVwIwySXugdNd+5ejhqp/+NmgIwGX3Py3QBmlEi54KlwmjkOytQ+iJrLJj23S4GkOeecg8G091no737qvRRdzE+HLALQoMTBbJgBsCj5RSWUlUVJiZ4SOljb05eLFWgoJ5oY6yTyJp62D39jDANoKKcSocPJD5dQYzlFAFZJflUArgTPZKZwLXAnHmerfJquUkKZEgyzqOb5TuDt1P3nwxobqwPocZA11m4A1mBx5IxNgRH21ti7KbAGiyNn3HoF/gJ0w05A8xclpwAAAABJRU5ErkJggg==' /><h1>{v}</h1><h3>WiFiManager</h3>";
+const char HTTP_ROOT_MAIN[] PROGMEM = "<h1>{t}</h1><h3>{v}</h3>";
+
+const char * const HTTP_PORTAL_MENU[] PROGMEM = {
+"<form action='/wifi' method='get'><button>Configure WiFi</button></form><br/>\n", // MENU_WIFI
+"<form action='/0wifi' method='get'><button>Configure WiFi (No Scan)</button></form><br/>\n", // MENU_WIFINOSCAN
+"<form action='/info' method='get'><button>Info</button></form><br/>\n", // MENU_INFO
+"<form action='/param' method='get'><button>Setup</button></form><br/>\n",//MENU_PARAM
+"<form action='/close' method='get'><button>Close</button></form><br/>\n", // MENU_CLOSE
+"<form action='/restart' method='get'><button>Restart</button></form><br/>\n",// MENU_RESTART
+"<form action='/exit' method='get'><button>Exit</button></form><br/>\n", // MENU_EXIT
+"<form action='/erase' method='get'><button class='D'>Erase</button></form><br/>\n", // MENU_ERASE
+"<form action='/update' method='get'><button>Update</button></form><br/>\n",// MENU_UPDATE
+"<hr><br/>" // MENU_SEP
+};
+
+// const char HTTP_PORTAL_OPTIONS[] PROGMEM = strcat(HTTP_PORTAL_MENU[0] , HTTP_PORTAL_MENU[3] , HTTP_PORTAL_MENU[7]);
+const char HTTP_PORTAL_OPTIONS[] PROGMEM = "";
+const char HTTP_ITEM_QI[] PROGMEM = "<div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i} {h}'></div>"; // rssi icons
+const char HTTP_ITEM_QP[] PROGMEM = "<div class='q {h}'>{r}%</div>"; // rssi percentage {h} = hidden showperc pref
+const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)' data-ssid='{V}'>{v}</a>{qi}{qp}</div>"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP
+// const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
+
+const char HTTP_FORM_START[] PROGMEM = "<form method='POST' action='{v}'>";
+const char HTTP_FORM_WIFI[] PROGMEM = "<label for='s'>SSID</label><input id='s' name='s' maxlength='32' autocorrect='off' autocapitalize='none' placeholder='{v}'><br/><label for='p'>Password</label><input id='p' name='p' maxlength='64' type='password' placeholder='{p}'><input type='checkbox' onclick='f()'> Show Password";
+const char HTTP_FORM_WIFI_END[] PROGMEM = "";
+const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "<hr><br/>";
+const char HTTP_FORM_END[] PROGMEM = "<br/><br/><button type='submit'>Save</button></form>";
+const char HTTP_FORM_LABEL[] PROGMEM = "<label for='{i}'>{t}</label>";
+const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "<hr><br/>";
+const char HTTP_FORM_PARAM[] PROGMEM = "<br/><input id='{i}' name='{n}' maxlength='{l}' value='{v}' {c}>\n"; // do not remove newline!
+
+const char HTTP_SCAN_LINK[] PROGMEM = "<br/><form action='/wifi?refresh=1' method='POST'><button name='refresh' value='1'>Refresh</button></form>";
+const char HTTP_SAVED[] PROGMEM = "<div class='msg'>Saving Credentials<br/>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
+const char HTTP_PARAMSAVED[] PROGMEM = "<div class='msg S'>Saved<br/></div>";
+const char HTTP_END[] PROGMEM = "</div></body></html>";
+const char HTTP_ERASEBTN[] PROGMEM = "<br/><form action='/erase' method='get'><button class='D'>Erase WiFi Config</button></form>";
+const char HTTP_UPDATEBTN[] PROGMEM = "<br/><form action='/update' method='get'><button>Update</button></form>";
+const char HTTP_BACKBTN[] PROGMEM = "<hr><br/><form action='/' method='get'><button>Back</button></form>";
+
+const char HTTP_STATUS_ON[] PROGMEM = "<div class='msg S'><strong>Connected</strong> to {v}<br/><em><small>with IP {i}</small></em></div>";
+const char HTTP_STATUS_OFF[] PROGMEM = "<div class='msg {c}'><strong>Not Connected</strong> to {v}{r}</div>"; // {c=class} {v=ssid} {r=status_off}
+const char HTTP_STATUS_OFFPW[] PROGMEM = "<br/>Authentication Failure"; // STATION_WRONG_PASSWORD, no eps32
+const char HTTP_STATUS_OFFNOAP[] PROGMEM = "<br/>AP not found"; // WL_NO_SSID_AVAIL
+const char HTTP_STATUS_OFFFAIL[] PROGMEM = "<br/>Could not Connect"; // WL_CONNECT_FAILED
+const char HTTP_STATUS_NONE[] PROGMEM = "<div class='msg'>No AP set</div>";
+const char HTTP_BR[] PROGMEM = "<br/>";
+
+const char HTTP_STYLE[] PROGMEM = "<style>"
+".c,body{text-align:center;font-family:verdana}div,input,select{padding:5px;font-size:1em;margin:5px 0;box-sizing:border-box}"
+"input,button,select,.msg{border-radius:.3rem;width: 100%}input[type=radio],input[type=checkbox]{width:auto}"
+"button,input[type='button'],input[type='submit']{cursor:pointer;border:0;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%}"
+"input[type='file']{border:1px solid #1fa3ec}"
+".wrap {text-align:left;display:inline-block;min-width:260px;max-width:500px}"
+// links
+"a{color:#000;font-weight:700;text-decoration:none}a:hover{color:#1fa3ec;text-decoration:underline}"
+// quality icons
+".q{height:16px;margin:0;padding:0 5px;text-align:right;min-width:38px;float:right}.q.q-0:after{background-position-x:0}.q.q-1:after{background-position-x:-16px}.q.q-2:after{background-position-x:-32px}.q.q-3:after{background-position-x:-48px}.q.q-4:after{background-position-x:-64px}.q.l:before{background-position-x:-80px;padding-right:5px}.ql .q{float:left}.q:after,.q:before{content:'';width:16px;height:16px;display:inline-block;background-repeat:no-repeat;background-position: 16px 0;"
+"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAAQCAMAAADeZIrLAAAAJFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADHJj5lAAAAC3RSTlMAIjN3iJmqu8zd7vF8pzcAAABsSURBVHja7Y1BCsAwCASNSVo3/v+/BUEiXnIoXkoX5jAQMxTHzK9cVSnvDxwD8bFx8PhZ9q8FmghXBhqA1faxk92PsxvRc2CCCFdhQCbRkLoAQ3q/wWUBqG35ZxtVzW4Ed6LngPyBU2CobdIDQ5oPWI5nCUwAAAAASUVORK5CYII=');}"
+// icons @2x media query (32px rescaled)
+"@media (-webkit-min-device-pixel-ratio: 2),(min-resolution: 192dpi){.q:before,.q:after {"
+"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALwAAAAgCAMAAACfM+KhAAAALVBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAOrOgAAAADnRSTlMAESIzRGZ3iJmqu8zd7gKjCLQAAACmSURBVHgB7dDBCoMwEEXRmKlVY3L//3NLhyzqIqSUggy8uxnhCR5Mo8xLt+14aZ7wwgsvvPA/ofv9+44334UXXngvb6XsFhO/VoC2RsSv9J7x8BnYLW+AjT56ud/uePMdb7IP8Bsc/e7h8Cfk912ghsNXWPpDC4hvN+D1560A1QPORyh84VKLjjdvfPFm++i9EWq0348XXnjhhT+4dIbCW+WjZim9AKk4UZMnnCEuAAAAAElFTkSuQmCC');"
+"background-size: 95px 16px;}}"
+// msg callouts
+".msg{padding:20px;margin:20px 0;border:1px solid #eee;border-left-width:5px;border-left-color:#777}.msg h4{margin-top:0;margin-bottom:5px}.msg.P{border-left-color:#1fa3ec}.msg.P h4{color:#1fa3ec}.msg.D{border-left-color:#dc3630}.msg.D h4{color:#dc3630}.msg.S{border-left-color: #5cb85c}.msg.S h4{color: #5cb85c}"
+// lists
+"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0;min-height:12px}"
+"td{vertical-align: top;}"
+".h{display:none}"
+"button{transition: 0s opacity;transition-delay: 3s;transition-duration: 0s;cursor: pointer}"
+"button.D{background-color:#dc3630}"
+"button:active{opacity:50% !important;cursor:wait;transition-delay: 0s}"
+// invert
+"body.invert,body.invert a,body.invert h1 {background-color:#060606;color:#fff;}"
+"body.invert .msg{color:#fff;background-color:#282828;border-top:1px solid #555;border-right:1px solid #555;border-bottom:1px solid #555;}"
+"body.invert .q[role=img]{-webkit-filter:invert(1);filter:invert(1);}"
+":disabled {opacity: 0.5;}"
+"</style>";
+
+#ifndef WM_NOHELP
+const char HTTP_HELP[] PROGMEM =
+ "<br/><h3>Available Pages</h3><hr>"
+ "<table class='table'>"
+ "<thead><tr><th>Page</th><th>Function</th></tr></thead><tbody>"
+ "<tr><td><a href='/'>/</a></td>"
+ "<td>Menu page.</td></tr>"
+ "<tr><td><a href='/wifi'>/wifi</a></td>"
+ "<td>Show WiFi scan results and enter WiFi configuration.(/0wifi noscan)</td></tr>"
+ "<tr><td><a href='/wifisave'>/wifisave</a></td>"
+ "<td>Save WiFi configuration information and configure device. Needs variables supplied.</td></tr>"
+ "<tr><td><a href='/param'>/param</a></td>"
+ "<td>Parameter page</td></tr>"
+ "<tr><td><a href='/info'>/info</a></td>"
+ "<td>Information page</td></tr>"
+ "<tr><td><a href='/u'>/u</a></td>"
+ "<td>OTA Update</td></tr>"
+ "<tr><td><a href='/close'>/close</a></td>"
+ "<td>Close the captiveportal popup,configportal will remain active</td></tr>"
+ "<tr><td>/exit</td>"
+ "<td>Exit Config Portal, configportal will close</td></tr>"
+ "<tr><td>/restart</td>"
+ "<td>Reboot the device</td></tr>"
+ "<tr><td>/erase</td>"
+ "<td>Erase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>"
+ "</table>"
+ "<p/>Github <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.";
+#else
+const char HTTP_HELP[] PROGMEM = "";
+#endif
+
+const char HTTP_UPDATE[] PROGMEM = "Upload New Firmware<br/><form method='POST' action='u' enctype='multipart/form-data' onchange=\"(function(el){document.getElementById('uploadbin').style.display = el.value=='' ? 'none' : 'initial';})(this)\"><input type='file' name='update' accept='.bin,application/octet-stream'><button id='uploadbin' type='submit' class='h D'>Update</button></form><small><a href='http://192.168.4.1/update' target='_blank'>* May not function inside captive portal, Open in browser http://192.168.4.1</a><small>";
+const char HTTP_UPDATE_FAIL[] PROGMEM = "<div class='msg D'><strong>Update Failed!</strong><Br/>Reboot device and try again</div>";
+const char HTTP_UPDATE_SUCCESS[] PROGMEM = "<div class='msg S'><strong>Update Successful. </strong> <br/> Device Rebooting now...</div>";
+
+#ifdef WM_JSTEST
+const char HTTP_JS[] PROGMEM =
+"<script>function postAjax(url, data, success) {"
+" var params = typeof data == 'string' ? data : Object.keys(data).map("
+" function(k){ return encodeURIComponent(k) + '=' + encodeURIComponent(data[k]) }"
+" ).join('&');"
+" var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject(\"Microsoft.XMLHTTP\");"
+" xhr.open('POST', url);"
+" xhr.onreadystatechange = function() {"
+" if (xhr.readyState>3 && xhr.status==200) { success(xhr.responseText); }"
+" };"
+" xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');"
+" xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');"
+" xhr.send(params);"
+" return xhr;}"
+"postAjax('/status', 'p1=1&p2=Hello+World', function(data){ console.log(data); });"
+"postAjax('/status', { p1: 1, p2: 'Hello World' }, function(data){ console.log(data); });"
+"</script>";
+#endif
+
+// Info html
+// @todo remove html elements from progmem, repetetive strings
+#ifdef ESP32
+ const char HTTP_INFO_esphead[] PROGMEM = "<h3>{1}</h3><hr><dl>";
+ const char HTTP_INFO_chiprev[] PROGMEM = "<dt>Chip Rev</dt><dd>{1}</dd>";
+ const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>CPU0: {1}<br/>CPU1: {2}</dd>";
+ const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access Point Hostname</dt><dd>{1}</dd>";
+ const char HTTP_INFO_psrsize[] PROGMEM = "<dt>PSRAM Size</dt><dd>{1} bytes</dd>";
+ const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C° / {2} F°</dd>";
+ // const char HTTP_INFO_temp[] PROGMEM = "<dt><dt>Hall</dt><dd>{3}</dd>";
+#else
+ const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp8266</h3><hr><dl>";
+ const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash Chip ID</dt><dd>{1}</dd>";
+ const char HTTP_INFO_corever[] PROGMEM = "<dt>Core Version</dt><dd>{1}</dd>";
+ const char HTTP_INFO_bootver[] PROGMEM = "<dt>Boot Version</dt><dd>{1}</dd>";
+ const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>{1}</dd>";
+ const char HTTP_INFO_flashsize[] PROGMEM = "<dt>Real Flash Size</dt><dd>{1} bytes</dd>";
+#endif
+
+const char HTTP_INFO_memsmeter[] PROGMEM = "<br/><progress value='{1}' max='{2}'></progress></dd>";
+const char HTTP_INFO_memsketch[] PROGMEM = "<dt>Memory - Sketch Size</dt><dd>Used / Total bytes<br/>{1} / {2}";
+const char HTTP_INFO_freeheap[] PROGMEM = "<dt>Memory - Free Heap</dt><dd>{1} bytes available</dd>";
+const char HTTP_INFO_wifihead[] PROGMEM = "<br/><h3>WiFi <small><em>({1})</em></small></h3><hr>";
+const char HTTP_INFO_uptime[] PROGMEM = "<dt>Uptime</dt><dd>{1} Mins {2} Secs</dd>";
+const char HTTP_INFO_chipid[] PROGMEM = "<dt>Chip ID</dt><dd>{1}</dd>";
+const char HTTP_INFO_idesize[] PROGMEM = "<dt>Flash Size</dt><dd>{1} bytes</dd>";
+const char HTTP_INFO_sdkver[] PROGMEM = "<dt>SDK Version</dt><dd>{1}</dd>";
+const char HTTP_INFO_cpufreq[] PROGMEM = "<dt>CPU Frequency</dt><dd>{1}MHz</dd>";
+const char HTTP_INFO_apip[] PROGMEM = "<dt>Access Point IP</dt><dd>{1}</dd>";
+const char HTTP_INFO_apmac[] PROGMEM = "<dt>Access Point MAC</dt><dd>{1}</dd>";
+const char HTTP_INFO_apssid[] PROGMEM = "<dt>Access Point SSID</dt><dd>{1}</dd>";
+const char HTTP_INFO_apbssid[] PROGMEM = "<dt>BSSID</dt><dd>{1}</dd>";
+const char HTTP_INFO_stassid[] PROGMEM = "<dt>Station SSID</dt><dd>{1}</dd>";
+const char HTTP_INFO_staip[] PROGMEM = "<dt>Station IP</dt><dd>{1}</dd>";
+const char HTTP_INFO_stagw[] PROGMEM = "<dt>Station Gateway</dt><dd>{1}</dd>";
+const char HTTP_INFO_stasub[] PROGMEM = "<dt>Station Subnet</dt><dd>{1}</dd>";
+const char HTTP_INFO_dnss[] PROGMEM = "<dt>DNS Server</dt><dd>{1}</dd>";
+const char HTTP_INFO_host[] PROGMEM = "<dt>Hostname</dt><dd>{1}</dd>";
+const char HTTP_INFO_stamac[] PROGMEM = "<dt>Station MAC</dt><dd>{1}</dd>";
+const char HTTP_INFO_conx[] PROGMEM = "<dt>Connected</dt><dd>{1}</dd>";
+const char HTTP_INFO_autoconx[] PROGMEM = "<dt>Autoconnect</dt><dd>{1}</dd>";
+
+const char HTTP_INFO_aboutver[] PROGMEM = "<dt>WiFiManager</dt><dd>{1}</dd>";
+const char HTTP_INFO_aboutarduino[] PROGMEM = "<dt>Arduino</dt><dd>{1}</dd>";
+const char HTTP_INFO_aboutsdk[] PROGMEM = "<dt>ESP-SDK/IDF</dt><dd>{1}</dd>";
+const char HTTP_INFO_aboutdate[] PROGMEM = "<dt>Build Date</dt><dd>{1}</dd>";
+
+const char S_brand[] PROGMEM = "WiFiManager";
+const char S_debugPrefix[] PROGMEM = "*wm:";
+const char S_y[] PROGMEM = "Yes";
+const char S_n[] PROGMEM = "No";
+const char S_enable[] PROGMEM = "Enabled";
+const char S_disable[] PROGMEM = "Disabled";
+const char S_GET[] PROGMEM = "GET";
+const char S_POST[] PROGMEM = "POST";
+const char S_NA[] PROGMEM = "Unknown";
+const char S_passph[] PROGMEM = "********";
+const char S_titlewifisaved[] PROGMEM = "Credentials Saved";
+const char S_titlewifisettings[] PROGMEM = "Settings Saved";
+const char S_titlewifi[] PROGMEM = "Config ESP";
+const char S_titleinfo[] PROGMEM = "Info";
+const char S_titleparam[] PROGMEM = "Setup";
+const char S_titleparamsaved[] PROGMEM = "Setup Saved";
+const char S_titleexit[] PROGMEM = "Exit";
+const char S_titlereset[] PROGMEM = "Reset";
+const char S_titleerase[] PROGMEM = "Erase";
+const char S_titleclose[] PROGMEM = "Close";
+const char S_options[] PROGMEM = "options";
+const char S_nonetworks[] PROGMEM = "No networks found. Refresh to scan again.";
+const char S_staticip[] PROGMEM = "Static IP";
+const char S_staticgw[] PROGMEM = "Static Gateway";
+const char S_staticdns[] PROGMEM = "Static DNS";
+const char S_subnet[] PROGMEM = "Subnet";
+const char S_exiting[] PROGMEM = "Exiting";
+const char S_resetting[] PROGMEM = "Module will reset in a few seconds.";
+const char S_closing[] PROGMEM = "You can close the page, portal will continue to run";
+const char S_error[] PROGMEM = "An Error Occured";
+const char S_notfound[] PROGMEM = "File Not Found\n\n";
+const char S_uri[] PROGMEM = "URI: ";
+const char S_method[] PROGMEM = "\nMethod: ";
+const char S_args[] PROGMEM = "\nArguments: ";
+const char S_parampre[] PROGMEM = "param_";
+
+// debug strings
+const char D_HR[] PROGMEM = "--------------------";
+
+// END WIFI_MANAGER_OVERRIDE_STRINGS
+#endif
+
+// -----------------------------------------------------------------------------------------------
+// DO NOT EDIT BELOW THIS LINE
+
+const uint8_t _nummenutokens = 11;
+const char * const _menutokens[_nummenutokens] PROGMEM = {
+ "wifi",
+ "wifinoscan",
+ "info",
+ "param",
+ "close",
+ "restart",
+ "exit",
+ "erase",
+ "update",
+ "sep",
+ "custom"
+};
+
+const char R_root[] PROGMEM = "/";
+const char R_wifi[] PROGMEM = "/wifi";
+const char R_wifinoscan[] PROGMEM = "/0wifi";
+const char R_wifisave[] PROGMEM = "/wifisave";
+const char R_info[] PROGMEM = "/info";
+const char R_param[] PROGMEM = "/param";
+const char R_paramsave[] PROGMEM = "/paramsave";
+const char R_restart[] PROGMEM = "/restart";
+const char R_exit[] PROGMEM = "/exit";
+const char R_close[] PROGMEM = "/close";
+const char R_erase[] PROGMEM = "/erase";
+const char R_status[] PROGMEM = "/status";
+const char R_update[] PROGMEM = "/update";
+const char R_updatedone[] PROGMEM = "/u";
+
+
+//Strings
+const char S_ip[] PROGMEM = "ip";
+const char S_gw[] PROGMEM = "gw";
+const char S_sn[] PROGMEM = "sn";
+const char S_dns[] PROGMEM = "dns";
+
+// softap ssid default prefix
+#ifdef ESP8266
+ const char S_ssidpre[] PROGMEM = "ESP";
+#elif defined(ESP32)
+ const char S_ssidpre[] PROGMEM = "ESP32";
+#else
+ const char S_ssidpre[] PROGMEM = "WM";
+#endif
+
+//Tokens
+//@todo consolidate and reduce
+const char T_ss[] PROGMEM = "{"; // token start sentinel
+const char T_es[] PROGMEM = "}"; // token end sentinel
+const char T_1[] PROGMEM = "{1}"; // @token 1
+const char T_2[] PROGMEM = "{2}"; // @token 2
+const char T_3[] PROGMEM = "{3}"; // @token 2
+const char T_v[] PROGMEM = "{v}"; // @token v
+const char T_V[] PROGMEM = "{V}"; // @token v
+const char T_I[] PROGMEM = "{I}"; // @token I
+const char T_i[] PROGMEM = "{i}"; // @token i
+const char T_n[] PROGMEM = "{n}"; // @token n
+const char T_p[] PROGMEM = "{p}"; // @token p
+const char T_t[] PROGMEM = "{t}"; // @token t
+const char T_l[] PROGMEM = "{l}"; // @token l
+const char T_c[] PROGMEM = "{c}"; // @token c
+const char T_e[] PROGMEM = "{e}"; // @token e
+const char T_q[] PROGMEM = "{q}"; // @token q
+const char T_r[] PROGMEM = "{r}"; // @token r
+const char T_R[] PROGMEM = "{R}"; // @token R
+const char T_h[] PROGMEM = "{h}"; // @token h
+
+// http
+const char HTTP_HEAD_CL[] PROGMEM = "Content-Length";
+const char HTTP_HEAD_CT[] PROGMEM = "text/html";
+const char HTTP_HEAD_CT2[] PROGMEM = "text/plain";
+const char HTTP_HEAD_CORS[] PROGMEM = "Access-Control-Allow-Origin";
+const char HTTP_HEAD_CORS_ALLOW_ALL[] PROGMEM = "*";
+
+const char * const WIFI_STA_STATUS[] PROGMEM
+{
+ "WL_IDLE_STATUS", // 0 STATION_IDLE
+ "WL_NO_SSID_AVAIL", // 1 STATION_NO_AP_FOUND
+ "WL_SCAN_COMPLETED", // 2
+ "WL_CONNECTED", // 3 STATION_GOT_IP
+ "WL_CONNECT_FAILED", // 4 STATION_CONNECT_FAIL, STATION_WRONG_PASSWORD(NI)
+ "WL_CONNECTION_LOST", // 5
+ "WL_DISCONNECTED", // 6
+ "WL_STATION_WRONG_PASSWORD" // 7 KLUDGE
+};
+
+#ifdef ESP32
+const char * const AUTH_MODE_NAMES[] PROGMEM
+{
+ "OPEN",
+ "WEP",
+ "WPA_PSK",
+ "WPA2_PSK",
+ "WPA_WPA2_PSK",
+ "WPA2_ENTERPRISE",
+ "MAX"
+};
+#elif defined(ESP8266)
+const char * const AUTH_MODE_NAMES[] PROGMEM
+{
+ "",
+ "",
+ "WPA_PSK", // 2 ENC_TYPE_TKIP
+ "",
+ "WPA2_PSK", // 4 ENC_TYPE_CCMP
+ "WEP", // 5 ENC_TYPE_WEP
+ "",
+ "OPEN", //7 ENC_TYPE_NONE
+ "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO
+};
+#endif
+
+const char* const WIFI_MODES[] PROGMEM = { "NULL", "STA", "AP", "STA+AP" };
+
+
+#ifdef ESP32
+// as 2.5.2
+// typedef struct {
+// char cc[3]; /**< country code string */
+// uint8_t schan; /**< start channel */
+// uint8_t nchan; /**< total channel number */
+// int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */
+// wifi_country_policy_t policy; /**< country policy */
+// } wifi_country_t;
+const wifi_country_t WM_COUNTRY_US{"US",1,11,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
+const wifi_country_t WM_COUNTRY_CN{"CN",1,13,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
+const wifi_country_t WM_COUNTRY_JP{"JP",1,14,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
+#elif defined(ESP8266) && !defined(WM_NOCOUNTRY)
+// typedef struct {
+// char cc[3]; /**< country code string */
+// uint8_t schan; /**< start channel */
+// uint8_t nchan; /**< total channel number */
+// uint8_t policy; /**< country policy */
+// } wifi_country_t;
+const wifi_country_t WM_COUNTRY_US{"US",1,11,WIFI_COUNTRY_POLICY_AUTO};
+const wifi_country_t WM_COUNTRY_CN{"CN",1,13,WIFI_COUNTRY_POLICY_AUTO};
+const wifi_country_t WM_COUNTRY_JP{"JP",1,14,WIFI_COUNTRY_POLICY_AUTO};
+#endif
+
+
+/*
+* ESP32 WiFi Events
+
+0 SYSTEM_EVENT_WIFI_READY < ESP32 WiFi ready
+1 SYSTEM_EVENT_SCAN_DONE < ESP32 finish scanning AP
+2 SYSTEM_EVENT_STA_START < ESP32 station start
+3 SYSTEM_EVENT_STA_STOP < ESP32 station stop
+4 SYSTEM_EVENT_STA_CONNECTED < ESP32 station connected to AP
+5 SYSTEM_EVENT_STA_DISCONNECTED < ESP32 station disconnected from AP
+6 SYSTEM_EVENT_STA_AUTHMODE_CHANGE < the auth mode of AP connected by ESP32 station changed
+7 SYSTEM_EVENT_STA_GOT_IP < ESP32 station got IP from connected AP
+8 SYSTEM_EVENT_STA_LOST_IP < ESP32 station lost IP and the IP is reset to 0
+9 SYSTEM_EVENT_STA_WPS_ER_SUCCESS < ESP32 station wps succeeds in enrollee mode
+10 SYSTEM_EVENT_STA_WPS_ER_FAILED < ESP32 station wps fails in enrollee mode
+11 SYSTEM_EVENT_STA_WPS_ER_TIMEOUT < ESP32 station wps timeout in enrollee mode
+12 SYSTEM_EVENT_STA_WPS_ER_PIN < ESP32 station wps pin code in enrollee mode
+13 SYSTEM_EVENT_AP_START < ESP32 soft-AP start
+14 SYSTEM_EVENT_AP_STOP < ESP32 soft-AP stop
+15 SYSTEM_EVENT_AP_STACONNECTED < a station connected to ESP32 soft-AP
+16 SYSTEM_EVENT_AP_STADISCONNECTED < a station disconnected from ESP32 soft-AP
+17 SYSTEM_EVENT_AP_STAIPASSIGNED < ESP32 soft-AP assign an IP to a connected station
+18 SYSTEM_EVENT_AP_PROBEREQRECVED < Receive probe request packet in soft-AP interface
+19 SYSTEM_EVENT_GOT_IP6 < ESP32 station or ap or ethernet interface v6IP addr is preferred
+20 SYSTEM_EVENT_ETH_START < ESP32 ethernet start
+21 SYSTEM_EVENT_ETH_STOP < ESP32 ethernet stop
+22 SYSTEM_EVENT_ETH_CONNECTED < ESP32 ethernet phy link up
+23 SYSTEM_EVENT_ETH_DISCONNECTED < ESP32 ethernet phy link down
+24 SYSTEM_EVENT_ETH_GOT_IP < ESP32 ethernet got IP from connected AP
+25 SYSTEM_EVENT_MAX
+
+
+typedef enum {
+ ARDUINO_EVENT_WIFI_READY = 0,
+ ARDUINO_EVENT_WIFI_SCAN_DONE,
+ ARDUINO_EVENT_WIFI_STA_START,
+ ARDUINO_EVENT_WIFI_STA_STOP,
+ ARDUINO_EVENT_WIFI_STA_CONNECTED,
+ ARDUINO_EVENT_WIFI_STA_DISCONNECTED,
+ ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE,
+ ARDUINO_EVENT_WIFI_STA_GOT_IP,
+ ARDUINO_EVENT_WIFI_STA_GOT_IP6,
+ ARDUINO_EVENT_WIFI_STA_LOST_IP,
+ ARDUINO_EVENT_WIFI_AP_START,
+ ARDUINO_EVENT_WIFI_AP_STOP,
+ ARDUINO_EVENT_WIFI_AP_STACONNECTED,
+ ARDUINO_EVENT_WIFI_AP_STADISCONNECTED,
+ ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED,
+ ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED,
+ ARDUINO_EVENT_WIFI_AP_GOT_IP6,
+ ARDUINO_EVENT_WIFI_FTM_REPORT,
+ ARDUINO_EVENT_ETH_START,
+ ARDUINO_EVENT_ETH_STOP,
+ ARDUINO_EVENT_ETH_CONNECTED,
+ ARDUINO_EVENT_ETH_DISCONNECTED,
+ ARDUINO_EVENT_ETH_GOT_IP,
+ ARDUINO_EVENT_ETH_GOT_IP6,
+ ARDUINO_EVENT_WPS_ER_SUCCESS,
+ ARDUINO_EVENT_WPS_ER_FAILED,
+ ARDUINO_EVENT_WPS_ER_TIMEOUT,
+ ARDUINO_EVENT_WPS_ER_PIN,
+ ARDUINO_EVENT_WPS_ER_PBC_OVERLAP,
+ ARDUINO_EVENT_SC_SCAN_DONE,
+ ARDUINO_EVENT_SC_FOUND_CHANNEL,
+ ARDUINO_EVENT_SC_GOT_SSID_PSWD,
+ ARDUINO_EVENT_SC_SEND_ACK_DONE,
+ ARDUINO_EVENT_PROV_INIT,
+ ARDUINO_EVENT_PROV_DEINIT,
+ ARDUINO_EVENT_PROV_START,
+ ARDUINO_EVENT_PROV_END,
+ ARDUINO_EVENT_PROV_CRED_RECV,
+ ARDUINO_EVENT_PROV_CRED_FAIL,
+ ARDUINO_EVENT_PROV_CRED_SUCCESS,
+ ARDUINO_EVENT_MAX
+} arduino_event_id_t;
+
+typedef union {
+ wifi_event_sta_scan_done_t wifi_scan_done;
+ wifi_event_sta_authmode_change_t wifi_sta_authmode_change;
+ wifi_event_sta_connected_t wifi_sta_connected;
+ wifi_event_sta_disconnected_t wifi_sta_disconnected;
+ wifi_event_sta_wps_er_pin_t wps_er_pin;
+ wifi_event_sta_wps_fail_reason_t wps_fail_reason;
+ wifi_event_ap_probe_req_rx_t wifi_ap_probereqrecved;
+ wifi_event_ap_staconnected_t wifi_ap_staconnected;
+ wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected;
+ wifi_event_ftm_report_t wifi_ftm_report;
+ ip_event_ap_staipassigned_t wifi_ap_staipassigned;
+ ip_event_got_ip_t got_ip;
+ ip_event_got_ip6_t got_ip6;
+ smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
+ esp_eth_handle_t eth_connected;
+ wifi_sta_config_t prov_cred_recv;
+ wifi_prov_sta_fail_reason_t prov_fail_reason;
+} arduino_event_info_t;
+
+*/
+#endif
diff --git a/neosensor/libraries/WiFiManager/wm_consts_en.h b/neosensor/libraries/WiFiManager/wm_consts_en.h
deleted file mode 100644
index fc21b42ff6effbd8cc47633c5dc119fc108ee123..0000000000000000000000000000000000000000
--- a/neosensor/libraries/WiFiManager/wm_consts_en.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * wm_consts.h
- * internal const strings/tokens
- * WiFiManager, a library for the ESP8266/Arduino platform
- * for configuration of WiFi credentials using a Captive Portal
- *
- * @author Creator tzapu
- * @author tablatronix
- * @version 0.0.0
- * @license MIT
- */
-
-#ifndef _WM_CONSTS_H
-#define _WM_CONSTS_H
-
-
-// -----------------------------------------------------------------------------------------------
-// TOKENS
-
-const char WM_VERSION_STR[] PROGMEM = "v2.0.15-rc.1";
-
-const uint8_t _nummenutokens = 11;
-const char * const _menutokens[_nummenutokens] PROGMEM = {
- "wifi",
- "wifinoscan",
- "info",
- "param",
- "close",
- "restart",
- "exit",
- "erase",
- "update",
- "sep",
- "custom"
-};
-
-const char R_root[] PROGMEM = "/";
-const char R_wifi[] PROGMEM = "/wifi";
-const char R_wifinoscan[] PROGMEM = "/0wifi";
-const char R_wifisave[] PROGMEM = "/wifisave";
-const char R_info[] PROGMEM = "/info";
-const char R_param[] PROGMEM = "/param";
-const char R_paramsave[] PROGMEM = "/paramsave";
-const char R_restart[] PROGMEM = "/restart";
-const char R_exit[] PROGMEM = "/exit";
-const char R_close[] PROGMEM = "/close";
-const char R_erase[] PROGMEM = "/erase";
-const char R_status[] PROGMEM = "/status";
-const char R_update[] PROGMEM = "/update";
-const char R_updatedone[] PROGMEM = "/u";
-
-
-//Strings
-const char S_ip[] PROGMEM = "ip";
-const char S_gw[] PROGMEM = "gw";
-const char S_sn[] PROGMEM = "sn";
-const char S_dns[] PROGMEM = "dns";
-
-
-
-//Tokens
-//@todo consolidate and reduce
-const char T_ss[] PROGMEM = "{"; // token start sentinel
-const char T_es[] PROGMEM = "}"; // token end sentinel
-const char T_1[] PROGMEM = "{1}"; // @token 1
-const char T_2[] PROGMEM = "{2}"; // @token 2
-const char T_3[] PROGMEM = "{3}"; // @token 2
-const char T_v[] PROGMEM = "{v}"; // @token v
-const char T_V[] PROGMEM = "{V}"; // @token v
-const char T_I[] PROGMEM = "{I}"; // @token I
-const char T_i[] PROGMEM = "{i}"; // @token i
-const char T_n[] PROGMEM = "{n}"; // @token n
-const char T_p[] PROGMEM = "{p}"; // @token p
-const char T_t[] PROGMEM = "{t}"; // @token t
-const char T_l[] PROGMEM = "{l}"; // @token l
-const char T_c[] PROGMEM = "{c}"; // @token c
-const char T_e[] PROGMEM = "{e}"; // @token e
-const char T_q[] PROGMEM = "{q}"; // @token q
-const char T_r[] PROGMEM = "{r}"; // @token r
-const char T_R[] PROGMEM = "{R}"; // @token R
-const char T_h[] PROGMEM = "{h}"; // @token h
-
-// http
-const char HTTP_HEAD_CL[] PROGMEM = "Content-Length";
-const char HTTP_HEAD_CT[] PROGMEM = "text/html";
-const char HTTP_HEAD_CT2[] PROGMEM = "text/plain";
-const char HTTP_HEAD_CORS[] PROGMEM = "Access-Control-Allow-Origin";
-const char HTTP_HEAD_CORS_ALLOW_ALL[] PROGMEM = "*";
-
-const char * const WIFI_STA_STATUS[] PROGMEM
-{
- "WL_IDLE_STATUS", // 0 STATION_IDLE
- "WL_NO_SSID_AVAIL", // 1 STATION_NO_AP_FOUND
- "WL_SCAN_COMPLETED", // 2
- "WL_CONNECTED", // 3 STATION_GOT_IP
- "WL_CONNECT_FAILED", // 4 STATION_CONNECT_FAIL, STATION_WRONG_PASSWORD(NI)
- "WL_CONNECTION_LOST", // 5
- "WL_DISCONNECTED", // 6
- "WL_STATION_WRONG_PASSWORD" // 7 KLUDGE
-};
-
-#ifdef ESP32
-const char * const AUTH_MODE_NAMES[] PROGMEM
-{
- "OPEN",
- "WEP",
- "WPA_PSK",
- "WPA2_PSK",
- "WPA_WPA2_PSK",
- "WPA2_ENTERPRISE",
- "MAX"
-};
-#elif defined(ESP8266)
-const char * const AUTH_MODE_NAMES[] PROGMEM
-{
- "",
- "",
- "WPA_PSK", // 2 ENC_TYPE_TKIP
- "",
- "WPA2_PSK", // 4 ENC_TYPE_CCMP
- "WEP", // 5 ENC_TYPE_WEP
- "",
- "OPEN", //7 ENC_TYPE_NONE
- "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO
-};
-#endif
-
-const char* const WIFI_MODES[] PROGMEM = { "NULL", "STA", "AP", "STA+AP" };
-
-
-#ifdef ESP32
-// as 2.5.2
-// typedef struct {
-// char cc[3]; /**< country code string */
-// uint8_t schan; /**< start channel */
-// uint8_t nchan; /**< total channel number */
-// int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */
-// wifi_country_policy_t policy; /**< country policy */
-// } wifi_country_t;
-const wifi_country_t WM_COUNTRY_US{"US",1,11,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
-const wifi_country_t WM_COUNTRY_CN{"CN",1,13,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
-const wifi_country_t WM_COUNTRY_JP{"JP",1,14,CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER,WIFI_COUNTRY_POLICY_AUTO};
-#elif defined(ESP8266) && !defined(WM_NOCOUNTRY)
-// typedef struct {
-// char cc[3]; /**< country code string */
-// uint8_t schan; /**< start channel */
-// uint8_t nchan; /**< total channel number */
-// uint8_t policy; /**< country policy */
-// } wifi_country_t;
-const wifi_country_t WM_COUNTRY_US{"US",1,11,WIFI_COUNTRY_POLICY_AUTO};
-const wifi_country_t WM_COUNTRY_CN{"CN",1,13,WIFI_COUNTRY_POLICY_AUTO};
-const wifi_country_t WM_COUNTRY_JP{"JP",1,14,WIFI_COUNTRY_POLICY_AUTO};
-#endif
-
-
-/*
-* ESP32 WiFi Events
-
-0 SYSTEM_EVENT_WIFI_READY < ESP32 WiFi ready
-1 SYSTEM_EVENT_SCAN_DONE < ESP32 finish scanning AP
-2 SYSTEM_EVENT_STA_START < ESP32 station start
-3 SYSTEM_EVENT_STA_STOP < ESP32 station stop
-4 SYSTEM_EVENT_STA_CONNECTED < ESP32 station connected to AP
-5 SYSTEM_EVENT_STA_DISCONNECTED < ESP32 station disconnected from AP
-6 SYSTEM_EVENT_STA_AUTHMODE_CHANGE < the auth mode of AP connected by ESP32 station changed
-7 SYSTEM_EVENT_STA_GOT_IP < ESP32 station got IP from connected AP
-8 SYSTEM_EVENT_STA_LOST_IP < ESP32 station lost IP and the IP is reset to 0
-9 SYSTEM_EVENT_STA_WPS_ER_SUCCESS < ESP32 station wps succeeds in enrollee mode
-10 SYSTEM_EVENT_STA_WPS_ER_FAILED < ESP32 station wps fails in enrollee mode
-11 SYSTEM_EVENT_STA_WPS_ER_TIMEOUT < ESP32 station wps timeout in enrollee mode
-12 SYSTEM_EVENT_STA_WPS_ER_PIN < ESP32 station wps pin code in enrollee mode
-13 SYSTEM_EVENT_AP_START < ESP32 soft-AP start
-14 SYSTEM_EVENT_AP_STOP < ESP32 soft-AP stop
-15 SYSTEM_EVENT_AP_STACONNECTED < a station connected to ESP32 soft-AP
-16 SYSTEM_EVENT_AP_STADISCONNECTED < a station disconnected from ESP32 soft-AP
-17 SYSTEM_EVENT_AP_STAIPASSIGNED < ESP32 soft-AP assign an IP to a connected station
-18 SYSTEM_EVENT_AP_PROBEREQRECVED < Receive probe request packet in soft-AP interface
-19 SYSTEM_EVENT_GOT_IP6 < ESP32 station or ap or ethernet interface v6IP addr is preferred
-20 SYSTEM_EVENT_ETH_START < ESP32 ethernet start
-21 SYSTEM_EVENT_ETH_STOP < ESP32 ethernet stop
-22 SYSTEM_EVENT_ETH_CONNECTED < ESP32 ethernet phy link up
-23 SYSTEM_EVENT_ETH_DISCONNECTED < ESP32 ethernet phy link down
-24 SYSTEM_EVENT_ETH_GOT_IP < ESP32 ethernet got IP from connected AP
-25 SYSTEM_EVENT_MAX
-
-
-typedef enum {
- ARDUINO_EVENT_WIFI_READY = 0,
- ARDUINO_EVENT_WIFI_SCAN_DONE,
- ARDUINO_EVENT_WIFI_STA_START,
- ARDUINO_EVENT_WIFI_STA_STOP,
- ARDUINO_EVENT_WIFI_STA_CONNECTED,
- ARDUINO_EVENT_WIFI_STA_DISCONNECTED,
- ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE,
- ARDUINO_EVENT_WIFI_STA_GOT_IP,
- ARDUINO_EVENT_WIFI_STA_GOT_IP6,
- ARDUINO_EVENT_WIFI_STA_LOST_IP,
- ARDUINO_EVENT_WIFI_AP_START,
- ARDUINO_EVENT_WIFI_AP_STOP,
- ARDUINO_EVENT_WIFI_AP_STACONNECTED,
- ARDUINO_EVENT_WIFI_AP_STADISCONNECTED,
- ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED,
- ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED,
- ARDUINO_EVENT_WIFI_AP_GOT_IP6,
- ARDUINO_EVENT_WIFI_FTM_REPORT,
- ARDUINO_EVENT_ETH_START,
- ARDUINO_EVENT_ETH_STOP,
- ARDUINO_EVENT_ETH_CONNECTED,
- ARDUINO_EVENT_ETH_DISCONNECTED,
- ARDUINO_EVENT_ETH_GOT_IP,
- ARDUINO_EVENT_ETH_GOT_IP6,
- ARDUINO_EVENT_WPS_ER_SUCCESS,
- ARDUINO_EVENT_WPS_ER_FAILED,
- ARDUINO_EVENT_WPS_ER_TIMEOUT,
- ARDUINO_EVENT_WPS_ER_PIN,
- ARDUINO_EVENT_WPS_ER_PBC_OVERLAP,
- ARDUINO_EVENT_SC_SCAN_DONE,
- ARDUINO_EVENT_SC_FOUND_CHANNEL,
- ARDUINO_EVENT_SC_GOT_SSID_PSWD,
- ARDUINO_EVENT_SC_SEND_ACK_DONE,
- ARDUINO_EVENT_PROV_INIT,
- ARDUINO_EVENT_PROV_DEINIT,
- ARDUINO_EVENT_PROV_START,
- ARDUINO_EVENT_PROV_END,
- ARDUINO_EVENT_PROV_CRED_RECV,
- ARDUINO_EVENT_PROV_CRED_FAIL,
- ARDUINO_EVENT_PROV_CRED_SUCCESS,
- ARDUINO_EVENT_MAX
-} arduino_event_id_t;
-
-typedef union {
- wifi_event_sta_scan_done_t wifi_scan_done;
- wifi_event_sta_authmode_change_t wifi_sta_authmode_change;
- wifi_event_sta_connected_t wifi_sta_connected;
- wifi_event_sta_disconnected_t wifi_sta_disconnected;
- wifi_event_sta_wps_er_pin_t wps_er_pin;
- wifi_event_sta_wps_fail_reason_t wps_fail_reason;
- wifi_event_ap_probe_req_rx_t wifi_ap_probereqrecved;
- wifi_event_ap_staconnected_t wifi_ap_staconnected;
- wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected;
- wifi_event_ftm_report_t wifi_ftm_report;
- ip_event_ap_staipassigned_t wifi_ap_staipassigned;
- ip_event_got_ip_t got_ip;
- ip_event_got_ip6_t got_ip6;
- smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
- esp_eth_handle_t eth_connected;
- wifi_sta_config_t prov_cred_recv;
- wifi_prov_sta_fail_reason_t prov_fail_reason;
-} arduino_event_info_t;
-
-*/
-
-#endif
\ No newline at end of file
diff --git a/neosensor/libraries/WiFiManager/wm_strings_en.h b/neosensor/libraries/WiFiManager/wm_strings_en.h
deleted file mode 100644
index 383ac445923040e37215bfd936464a7a8fda6798..0000000000000000000000000000000000000000
--- a/neosensor/libraries/WiFiManager/wm_strings_en.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * wm_strings_en.h
- * engligh strings for
- * WiFiManager, a library for the ESP8266/Arduino platform
- * for configuration of WiFi credentials using a Captive Portal
- *
- * @author Creator tzapu
- * @author tablatronix
- * @version 0.0.0
- * @license MIT
- */
-
-#ifndef _WM_STRINGS_EN_H_
-#define _WM_STRINGS_EN_H_
-
-
-#ifndef WIFI_MANAGER_OVERRIDE_STRINGS
-// !!! ABOVE WILL NOT WORK if you define in your sketch, must be build flag, if anyone one knows how to order includes to be able to do this it would be neat.. I have seen it done..
-
-// strings files must include a consts file!
-#include "wm_consts_en.h" // include constants, tokens, routes
-
-const char WM_LANGUAGE[] PROGMEM = "en-US"; // i18n lang code
-
-const char HTTP_HEAD_START[] PROGMEM = "<!DOCTYPE html>"
-"<html lang='en'><head>"
-"<meta name='format-detection' content='telephone=no'>"
-"<meta charset='UTF-8'>"
-"<meta name='viewport' content='width=device-width,initial-scale=1,user-scalable=no'/>"
-"<title>{v}</title>";
-
-const char HTTP_SCRIPT[] PROGMEM = "<script>function c(l){"
-"document.getElementById('s').value=l.getAttribute('data-ssid')||l.innerText||l.textContent;"
-"p = l.nextElementSibling.classList.contains('l');"
-"document.getElementById('p').disabled = !p;"
-"if(p)document.getElementById('p').focus();};"
-"function f() {var x = document.getElementById('p');x.type==='password'?x.type='text':x.type='password';}"
-"</script>"; // @todo add button states, disable on click , show ack , spinner etc
-
-const char HTTP_HEAD_END[] PROGMEM = "</head><body class='{c}'><div class='wrap'>"; // {c} = _bodyclass
-// example of embedded logo, base64 encoded inline, No styling here
-// const char HTTP_ROOT_MAIN[] PROGMEM = "<img title=' alt=' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAADQElEQVRoQ+2YjW0VQQyE7Q6gAkgFkAogFUAqgFQAVACpAKiAUAFQAaECQgWECggVGH1PPrRvn3dv9/YkFOksoUhhfzwz9ngvKrc89JbnLxuA/63gpsCmwCADWwkNEji8fVNgotDM7osI/x777x5l9F6JyB8R4eeVql4P0y8yNsjM7KGIPBORp558T04A+CwiH1UVUItiUQmZ2XMReSEiAFgjAPBeVS96D+sCYGaUx4cFbLfmhSpnqnrZuqEJgJnd8cQplVLciAgX//Cf0ToIeOB9wpmloLQAwpnVmAXgdf6pwjpJIz+XNoeZQQZlODV9vhc1Tuf6owrAk/8qIhFbJH7eI3eEzsvydQEICqBEkZwiALfF70HyHPpqScPV5HFjeFu476SkRA0AzOfy4hYwstj2ZkDgaphE7m6XqnoS7Q0BOPs/sw0kDROzjdXcCMFCNwzIy0EcRcOvBACfh4k0wgOmBX4xjfmk4DKTS31hgNWIKBCI8gdzogTgjYjQWFMw+o9LzJoZ63GUmjWm2wGDc7EvDDOj/1IVMIyD9SUAL0WEhpriRlXv5je5S+U1i2N88zdPuoVkeB+ls4SyxCoP3kVm9jsjpEsBLoOBNC5U9SwpGdakFkviuFP1keblATkTENTYcxkzgxTKOI3jyDxqLkQT87pMA++H3XvJBYtsNbBN6vuXq5S737WqHkW1VgMQNXJ0RshMqbbT33sJ5kpHWymzcJjNTeJIymJZtSQd9NHQHS1vodoFoTMkfbJzpRnLzB2vi6BZAJxWaCr+62BC+jzAxVJb3dmmiLzLwZhZNPE5e880Suo2AZgB8e8idxherqUPnT3brBDTlPxO3Z66rVwIwySXugdNd+5ejhqp/+NmgIwGX3Py3QBmlEi54KlwmjkOytQ+iJrLJj23S4GkOeecg8G091no737qvRRdzE+HLALQoMTBbJgBsCj5RSWUlUVJiZ4SOljb05eLFWgoJ5oY6yTyJp62D39jDANoKKcSocPJD5dQYzlFAFZJflUArgTPZKZwLXAnHmerfJquUkKZEgyzqOb5TuDt1P3nwxobqwPocZA11m4A1mBx5IxNgRH21ti7KbAGiyNn3HoF/gJ0w05A8xclpwAAAABJRU5ErkJggg==' /><h1>{v}</h1><h3>WiFiManager</h3>";
-const char HTTP_ROOT_MAIN[] PROGMEM = "<h1>{t}</h1><h3>{v}</h3>";
-
-const char * const HTTP_PORTAL_MENU[] PROGMEM = {
-"<form action='/wifi' method='get'><button>Configure WiFi</button></form><br/>\n", // MENU_WIFI
-"<form action='/0wifi' method='get'><button>Configure WiFi (No Scan)</button></form><br/>\n", // MENU_WIFINOSCAN
-"<form action='/info' method='get'><button>Info</button></form><br/>\n", // MENU_INFO
-"<form action='/param' method='get'><button>Setup</button></form><br/>\n",//MENU_PARAM
-"<form action='/close' method='get'><button>Close</button></form><br/>\n", // MENU_CLOSE
-"<form action='/restart' method='get'><button>Restart</button></form><br/>\n",// MENU_RESTART
-"<form action='/exit' method='get'><button>Exit</button></form><br/>\n", // MENU_EXIT
-"<form action='/erase' method='get'><button class='D'>Erase</button></form><br/>\n", // MENU_ERASE
-"<form action='/update' method='get'><button>Update</button></form><br/>\n",// MENU_UPDATE
-"<hr><br/>" // MENU_SEP
-};
-
-// const char HTTP_PORTAL_OPTIONS[] PROGMEM = strcat(HTTP_PORTAL_MENU[0] , HTTP_PORTAL_MENU[3] , HTTP_PORTAL_MENU[7]);
-const char HTTP_PORTAL_OPTIONS[] PROGMEM = "";
-const char HTTP_ITEM_QI[] PROGMEM = "<div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i} {h}'></div>"; // rssi icons
-const char HTTP_ITEM_QP[] PROGMEM = "<div class='q {h}'>{r}%</div>"; // rssi percentage {h} = hidden showperc pref
-const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)' data-ssid='{V}'>{v}</a>{qi}{qp}</div>"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP
-// const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
-
-const char HTTP_FORM_START[] PROGMEM = "<form method='POST' action='{v}'>";
-const char HTTP_FORM_WIFI[] PROGMEM = "<label for='s'>SSID</label><input id='s' name='s' maxlength='32' autocorrect='off' autocapitalize='none' placeholder='{v}'><br/><label for='p'>Password</label><input id='p' name='p' maxlength='64' type='password' placeholder='{p}'><input type='checkbox' onclick='f()'> Show Password";
-const char HTTP_FORM_WIFI_END[] PROGMEM = "";
-const char HTTP_FORM_STATIC_HEAD[] PROGMEM = "<hr><br/>";
-const char HTTP_FORM_END[] PROGMEM = "<br/><br/><button type='submit'>Save</button></form>";
-const char HTTP_FORM_LABEL[] PROGMEM = "<label for='{i}'>{t}</label>";
-const char HTTP_FORM_PARAM_HEAD[] PROGMEM = "<hr><br/>";
-const char HTTP_FORM_PARAM[] PROGMEM = "<br/><input id='{i}' name='{n}' maxlength='{l}' value='{v}' {c}>\n"; // do not remove newline!
-
-const char HTTP_SCAN_LINK[] PROGMEM = "<br/><form action='/wifi?refresh=1' method='POST'><button name='refresh' value='1'>Refresh</button></form>";
-const char HTTP_SAVED[] PROGMEM = "<div class='msg'>Saving Credentials<br/>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
-const char HTTP_PARAMSAVED[] PROGMEM = "<div class='msg S'>Saved<br/></div>";
-const char HTTP_END[] PROGMEM = "</div></body></html>";
-const char HTTP_ERASEBTN[] PROGMEM = "<br/><form action='/erase' method='get'><button class='D'>Erase WiFi Config</button></form>";
-const char HTTP_UPDATEBTN[] PROGMEM = "<br/><form action='/update' method='get'><button>Update</button></form>";
-const char HTTP_BACKBTN[] PROGMEM = "<hr><br/><form action='/' method='get'><button>Back</button></form>";
-
-const char HTTP_STATUS_ON[] PROGMEM = "<div class='msg S'><strong>Connected</strong> to {v}<br/><em><small>with IP {i}</small></em></div>";
-const char HTTP_STATUS_OFF[] PROGMEM = "<div class='msg {c}'><strong>Not Connected</strong> to {v}{r}</div>"; // {c=class} {v=ssid} {r=status_off}
-const char HTTP_STATUS_OFFPW[] PROGMEM = "<br/>Authentication Failure"; // STATION_WRONG_PASSWORD, no eps32
-const char HTTP_STATUS_OFFNOAP[] PROGMEM = "<br/>AP not found"; // WL_NO_SSID_AVAIL
-const char HTTP_STATUS_OFFFAIL[] PROGMEM = "<br/>Could not Connect"; // WL_CONNECT_FAILED
-const char HTTP_STATUS_NONE[] PROGMEM = "<div class='msg'>No AP set</div>";
-const char HTTP_BR[] PROGMEM = "<br/>";
-
-const char HTTP_STYLE[] PROGMEM = "<style>"
-".c,body{text-align:center;font-family:verdana}div,input,select{padding:5px;font-size:1em;margin:5px 0;box-sizing:border-box}"
-"input,button,select,.msg{border-radius:.3rem;width: 100%}input[type=radio],input[type=checkbox]{width:auto}"
-"button,input[type='button'],input[type='submit']{cursor:pointer;border:0;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%}"
-"input[type='file']{border:1px solid #1fa3ec}"
-".wrap {text-align:left;display:inline-block;min-width:260px;max-width:500px}"
-// links
-"a{color:#000;font-weight:700;text-decoration:none}a:hover{color:#1fa3ec;text-decoration:underline}"
-// quality icons
-".q{height:16px;margin:0;padding:0 5px;text-align:right;min-width:38px;float:right}.q.q-0:after{background-position-x:0}.q.q-1:after{background-position-x:-16px}.q.q-2:after{background-position-x:-32px}.q.q-3:after{background-position-x:-48px}.q.q-4:after{background-position-x:-64px}.q.l:before{background-position-x:-80px;padding-right:5px}.ql .q{float:left}.q:after,.q:before{content:'';width:16px;height:16px;display:inline-block;background-repeat:no-repeat;background-position: 16px 0;"
-"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAAQCAMAAADeZIrLAAAAJFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADHJj5lAAAAC3RSTlMAIjN3iJmqu8zd7vF8pzcAAABsSURBVHja7Y1BCsAwCASNSVo3/v+/BUEiXnIoXkoX5jAQMxTHzK9cVSnvDxwD8bFx8PhZ9q8FmghXBhqA1faxk92PsxvRc2CCCFdhQCbRkLoAQ3q/wWUBqG35ZxtVzW4Ed6LngPyBU2CobdIDQ5oPWI5nCUwAAAAASUVORK5CYII=');}"
-// icons @2x media query (32px rescaled)
-"@media (-webkit-min-device-pixel-ratio: 2),(min-resolution: 192dpi){.q:before,.q:after {"
-"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALwAAAAgCAMAAACfM+KhAAAALVBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAOrOgAAAADnRSTlMAESIzRGZ3iJmqu8zd7gKjCLQAAACmSURBVHgB7dDBCoMwEEXRmKlVY3L//3NLhyzqIqSUggy8uxnhCR5Mo8xLt+14aZ7wwgsvvPA/ofv9+44334UXXngvb6XsFhO/VoC2RsSv9J7x8BnYLW+AjT56ud/uePMdb7IP8Bsc/e7h8Cfk912ghsNXWPpDC4hvN+D1560A1QPORyh84VKLjjdvfPFm++i9EWq0348XXnjhhT+4dIbCW+WjZim9AKk4UZMnnCEuAAAAAElFTkSuQmCC');"
-"background-size: 95px 16px;}}"
-// msg callouts
-".msg{padding:20px;margin:20px 0;border:1px solid #eee;border-left-width:5px;border-left-color:#777}.msg h4{margin-top:0;margin-bottom:5px}.msg.P{border-left-color:#1fa3ec}.msg.P h4{color:#1fa3ec}.msg.D{border-left-color:#dc3630}.msg.D h4{color:#dc3630}.msg.S{border-left-color: #5cb85c}.msg.S h4{color: #5cb85c}"
-// lists
-"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0;min-height:12px}"
-"td{vertical-align: top;}"
-".h{display:none}"
-"button{transition: 0s opacity;transition-delay: 3s;transition-duration: 0s;cursor: pointer}"
-"button.D{background-color:#dc3630}"
-"button:active{opacity:50% !important;cursor:wait;transition-delay: 0s}"
-// invert
-"body.invert,body.invert a,body.invert h1 {background-color:#060606;color:#fff;}"
-"body.invert .msg{color:#fff;background-color:#282828;border-top:1px solid #555;border-right:1px solid #555;border-bottom:1px solid #555;}"
-"body.invert .q[role=img]{-webkit-filter:invert(1);filter:invert(1);}"
-":disabled {opacity: 0.5;}"
-"</style>";
-
-#ifndef WM_NOHELP
-const char HTTP_HELP[] PROGMEM =
- "<br/><h3>Available Pages</h3><hr>"
- "<table class='table'>"
- "<thead><tr><th>Page</th><th>Function</th></tr></thead><tbody>"
- "<tr><td><a href='/'>/</a></td>"
- "<td>Menu page.</td></tr>"
- "<tr><td><a href='/wifi'>/wifi</a></td>"
- "<td>Show WiFi scan results and enter WiFi configuration.(/0wifi noscan)</td></tr>"
- "<tr><td><a href='/wifisave'>/wifisave</a></td>"
- "<td>Save WiFi configuration information and configure device. Needs variables supplied.</td></tr>"
- "<tr><td><a href='/param'>/param</a></td>"
- "<td>Parameter page</td></tr>"
- "<tr><td><a href='/info'>/info</a></td>"
- "<td>Information page</td></tr>"
- "<tr><td><a href='/u'>/u</a></td>"
- "<td>OTA Update</td></tr>"
- "<tr><td><a href='/close'>/close</a></td>"
- "<td>Close the captiveportal popup,configportal will remain active</td></tr>"
- "<tr><td>/exit</td>"
- "<td>Exit Config Portal, configportal will close</td></tr>"
- "<tr><td>/restart</td>"
- "<td>Reboot the device</td></tr>"
- "<tr><td>/erase</td>"
- "<td>Erase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>"
- "</table>"
- "<p/>Github <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.";
-#else
-const char HTTP_HELP[] PROGMEM = "";
-#endif
-
-const char HTTP_UPDATE[] PROGMEM = "Upload New Firmware<br/><form method='POST' action='u' enctype='multipart/form-data' onchange=\"(function(el){document.getElementById('uploadbin').style.display = el.value=='' ? 'none' : 'initial';})(this)\"><input type='file' name='update' accept='.bin,application/octet-stream'><button id='uploadbin' type='submit' class='h D'>Update</button></form><small><a href='http://192.168.4.1/update' target='_blank'>* May not function inside captive portal, Open in browser http://192.168.4.1</a><small>";
-const char HTTP_UPDATE_FAIL[] PROGMEM = "<div class='msg D'><strong>Update Failed!</strong><Br/>Reboot device and try again</div>";
-const char HTTP_UPDATE_SUCCESS[] PROGMEM = "<div class='msg S'><strong>Update Successful. </strong> <br/> Device Rebooting now...</div>";
-
-#ifdef WM_JSTEST
-const char HTTP_JS[] PROGMEM =
-"<script>function postAjax(url, data, success) {"
-" var params = typeof data == 'string' ? data : Object.keys(data).map("
-" function(k){ return encodeURIComponent(k) + '=' + encodeURIComponent(data[k]) }"
-" ).join('&');"
-" var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject(\"Microsoft.XMLHTTP\");"
-" xhr.open('POST', url);"
-" xhr.onreadystatechange = function() {"
-" if (xhr.readyState>3 && xhr.status==200) { success(xhr.responseText); }"
-" };"
-" xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');"
-" xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');"
-" xhr.send(params);"
-" return xhr;}"
-"postAjax('/status', 'p1=1&p2=Hello+World', function(data){ console.log(data); });"
-"postAjax('/status', { p1: 1, p2: 'Hello World' }, function(data){ console.log(data); });"
-"</script>";
-#endif
-
-// Info html
-// @todo remove html elements from progmem, repetetive strings
-#ifdef ESP32
- const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp32</h3><hr><dl>";
- const char HTTP_INFO_chiprev[] PROGMEM = "<dt>Chip Rev</dt><dd>{1}</dd>";
- const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>CPU0: {1}<br/>CPU1: {2}</dd>";
- const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access Point Hostname</dt><dd>{1}</dd>";
- const char HTTP_INFO_psrsize[] PROGMEM = "<dt>PSRAM Size</dt><dd>{1} bytes</dd>";
- const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C° / {2} F°</dd><dt>Hall</dt><dd>{3}</dd>";
-#else
- const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp8266</h3><hr><dl>";
- const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash Chip ID</dt><dd>{1}</dd>";
- const char HTTP_INFO_corever[] PROGMEM = "<dt>Core Version</dt><dd>{1}</dd>";
- const char HTTP_INFO_bootver[] PROGMEM = "<dt>Boot Version</dt><dd>{1}</dd>";
- const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>{1}</dd>";
- const char HTTP_INFO_flashsize[] PROGMEM = "<dt>Real Flash Size</dt><dd>{1} bytes</dd>";
-#endif
-
-const char HTTP_INFO_memsmeter[] PROGMEM = "<br/><progress value='{1}' max='{2}'></progress></dd>";
-const char HTTP_INFO_memsketch[] PROGMEM = "<dt>Memory - Sketch Size</dt><dd>Used / Total bytes<br/>{1} / {2}";
-const char HTTP_INFO_freeheap[] PROGMEM = "<dt>Memory - Free Heap</dt><dd>{1} bytes available</dd>";
-const char HTTP_INFO_wifihead[] PROGMEM = "<br/><h3>WiFi</h3><hr>";
-const char HTTP_INFO_uptime[] PROGMEM = "<dt>Uptime</dt><dd>{1} Mins {2} Secs</dd>";
-const char HTTP_INFO_chipid[] PROGMEM = "<dt>Chip ID</dt><dd>{1}</dd>";
-const char HTTP_INFO_idesize[] PROGMEM = "<dt>Flash Size</dt><dd>{1} bytes</dd>";
-const char HTTP_INFO_sdkver[] PROGMEM = "<dt>SDK Version</dt><dd>{1}</dd>";
-const char HTTP_INFO_cpufreq[] PROGMEM = "<dt>CPU Frequency</dt><dd>{1}MHz</dd>";
-const char HTTP_INFO_apip[] PROGMEM = "<dt>Access Point IP</dt><dd>{1}</dd>";
-const char HTTP_INFO_apmac[] PROGMEM = "<dt>Access Point MAC</dt><dd>{1}</dd>";
-const char HTTP_INFO_apssid[] PROGMEM = "<dt>Access Point SSID</dt><dd>{1}</dd>";
-const char HTTP_INFO_apbssid[] PROGMEM = "<dt>BSSID</dt><dd>{1}</dd>";
-const char HTTP_INFO_stassid[] PROGMEM = "<dt>Station SSID</dt><dd>{1}</dd>";
-const char HTTP_INFO_staip[] PROGMEM = "<dt>Station IP</dt><dd>{1}</dd>";
-const char HTTP_INFO_stagw[] PROGMEM = "<dt>Station Gateway</dt><dd>{1}</dd>";
-const char HTTP_INFO_stasub[] PROGMEM = "<dt>Station Subnet</dt><dd>{1}</dd>";
-const char HTTP_INFO_dnss[] PROGMEM = "<dt>DNS Server</dt><dd>{1}</dd>";
-const char HTTP_INFO_host[] PROGMEM = "<dt>Hostname</dt><dd>{1}</dd>";
-const char HTTP_INFO_stamac[] PROGMEM = "<dt>Station MAC</dt><dd>{1}</dd>";
-const char HTTP_INFO_conx[] PROGMEM = "<dt>Connected</dt><dd>{1}</dd>";
-const char HTTP_INFO_autoconx[] PROGMEM = "<dt>Autoconnect</dt><dd>{1}</dd>";
-
-const char HTTP_INFO_aboutver[] PROGMEM = "<dt>WiFiManager</dt><dd>{1}</dd>";
-const char HTTP_INFO_aboutarduino[] PROGMEM = "<dt>Arduino</dt><dd>{1}</dd>";
-const char HTTP_INFO_aboutsdk[] PROGMEM = "<dt>ESP-SDK/IDF</dt><dd>{1}</dd>";
-const char HTTP_INFO_aboutdate[] PROGMEM = "<dt>Build Date</dt><dd>{1}</dd>";
-
-const char S_brand[] PROGMEM = "WiFiManager";
-const char S_debugPrefix[] PROGMEM = "*wm:";
-const char S_y[] PROGMEM = "Yes";
-const char S_n[] PROGMEM = "No";
-const char S_enable[] PROGMEM = "Enabled";
-const char S_disable[] PROGMEM = "Disabled";
-const char S_GET[] PROGMEM = "GET";
-const char S_POST[] PROGMEM = "POST";
-const char S_NA[] PROGMEM = "Unknown";
-const char S_passph[] PROGMEM = "********";
-const char S_titlewifisaved[] PROGMEM = "Credentials Saved";
-const char S_titlewifisettings[] PROGMEM = "Settings Saved";
-const char S_titlewifi[] PROGMEM = "Config ESP";
-const char S_titleinfo[] PROGMEM = "Info";
-const char S_titleparam[] PROGMEM = "Setup";
-const char S_titleparamsaved[] PROGMEM = "Setup Saved";
-const char S_titleexit[] PROGMEM = "Exit";
-const char S_titlereset[] PROGMEM = "Reset";
-const char S_titleerase[] PROGMEM = "Erase";
-const char S_titleclose[] PROGMEM = "Close";
-const char S_options[] PROGMEM = "options";
-const char S_nonetworks[] PROGMEM = "No networks found. Refresh to scan again.";
-const char S_staticip[] PROGMEM = "Static IP";
-const char S_staticgw[] PROGMEM = "Static Gateway";
-const char S_staticdns[] PROGMEM = "Static DNS";
-const char S_subnet[] PROGMEM = "Subnet";
-const char S_exiting[] PROGMEM = "Exiting";
-const char S_resetting[] PROGMEM = "Module will reset in a few seconds.";
-const char S_closing[] PROGMEM = "You can close the page, portal will continue to run";
-const char S_error[] PROGMEM = "An Error Occured";
-const char S_notfound[] PROGMEM = "File Not Found\n\n";
-const char S_uri[] PROGMEM = "URI: ";
-const char S_method[] PROGMEM = "\nMethod: ";
-const char S_args[] PROGMEM = "\nArguments: ";
-const char S_parampre[] PROGMEM = "param_";
-
-// debug strings
-const char D_HR[] PROGMEM = "--------------------";
-
-
-// softap ssid default prefix
-#ifdef ESP8266
- const char S_ssidpre[] PROGMEM = "ESP";
-#elif defined(ESP32)
- const char S_ssidpre[] PROGMEM = "ESP32";
-#else
- const char S_ssidpre[] PROGMEM = "WM";
-#endif
-
-// END WIFI_MANAGER_OVERRIDE_STRINGS
-#endif
-
-#endif
diff --git a/neosensor/neosensor.ino b/neosensor/neosensor.ino
index a4ecd9bb80262a59cbd3bec98477cb8ad58b2fb0..1e3cfb2add37882ff1592a554092cd7456c4aba8 100644
--- a/neosensor/neosensor.ino
+++ b/neosensor/neosensor.ino
@@ -634,6 +634,31 @@ void processWIFIparameters( wifiParametersMgt *wp=nullptr ) {
}
+// ---
+// show WiFi protocols in use
+void display_wifi_protocol( wifi_interface_t ifx=WIFI_IF_STA ) {
+
+ uint8_t cur_protocols;
+ esp_err_t _err;
+ _err = esp_wifi_get_protocol(ifx, &cur_protocols);
+ if( _err != ESP_OK ) {
+ log_error(F("\n[WiFiProtocol] Could not get protocol!"));
+ return;
+ }
+
+ log_debug(F("\nWIFI protocols = 0x"));log_debug(cur_protocols,HEX);log_flush();
+ if( cur_protocols & WIFI_PROTOCOL_11N ) {
+ log_debug(F("\n\tWiFi_Protocol_11n"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11G ) {
+ log_debug(F("\n\tWiFi_Protocol_11g"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11B ) {
+ log_debug(F("\n\tWiFi_Protocol_11b"));
+ }
+}
+
+
// ---
// earlySetup: called at the very begining of setup()
void earlySetup( void ) {
@@ -643,13 +668,16 @@ void earlySetup( void ) {
/* [jan.23] due to numerous DHCP issues, and following issue https://github.com/esp8266/Arduino/issues/8299
* we decided to set WiFi physical mode explicitly
+ * BEWARE IT IS PERSISTENT across reboot, flash ...
*/
#if defined(ESP8266)
- WiFi.setPhyMode(WIFI_PHY_MODE_11G); // [jan.23] does it solve esp8266 DHCP issue ??? not really sure
+ WiFi.setPhyMode(WIFI_PHY_MODE_11B); // [jan.23] 11B or 11G SOLVED OUR DHCP issue !!!
#elif defined(ESP32)
- esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G);
- // check with ESP_GET_protocol)
- esp_wifi_config_11b_rate(WIFI_IF_STA,true); // to suppress 802.11B
+ // set PERSISTANT mode for station
+ WiFi.mode(WIFI_STA);
+ esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B); // maybe check ret_code ?
+ //esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G);
+ //esp_wifi_config_11b_rate(WIFI_IF_STA,true); // to suppress 802.11B
#endif
// WiFi.disconnect(true); // to erase default credentials
@@ -699,6 +727,8 @@ void lateSetup( void ) {
WiFi.setAutoReconnect(true);
+ display_wifi_protocol();
+
#if ESP32
// switch back POWER MODES to auto
if( esp_sleep_pd_config(ESP_PD_DOMAIN_MAX,ESP_PD_OPTION_AUTO) != ESP_OK ) {
diff --git a/tests/WiFiManager_simple/WiFiManager_simple.ino b/tests/WiFiManager_simple/WiFiManager_simple.ino
index 23bd8dd019949d44cb8f6498f0e7fc21eee644bf..c813cae9329978c3382c773f150e670c227596fa 100644
--- a/tests/WiFiManager_simple/WiFiManager_simple.ino
+++ b/tests/WiFiManager_simple/WiFiManager_simple.ino
@@ -1,9 +1,58 @@
+/*
+ * Simple WiFi connect test intended to ESP32
+ * i.e NO WifiManager involved
+ *
+ * NOTE: WIFI PROTOCOL IS PERSISTENT ACROSS REBOOT and FLASH !!
+ */
+
+#if !defined(ESP32)
+#error "Wrong architecture ... ought to be ESP32"
+#endif
+
+#include <Arduino.h>
#include <WiFiManager.h> // https://github.com/tzapu/WiFiManager
+#include <esp_wifi.h>
+#include <esp_log.h>
+
+// Defines
+#define SET_WIFI_PROTOCOL 1
/* Global variables */
-const char *mySSID="neOCampus";
-const char *mySSIDpw="CHANGE_ME";
+const char* ssid = "freebox_Bonzo";
+const char* password = "Hedgehog";
+esp_err_t _err;
+
+
+/* Functions */
+void display_wifi_protocol( wifi_interface_t ifx=WIFI_IF_STA ) {
+
+ uint8_t cur_protocols;
+ _err = esp_wifi_get_protocol(ifx, &cur_protocols);
+ if( _err != ESP_OK ) {
+ Serial.println("Could not get protocol!");
+ //log_e("Could not get protocol! %d", _err);
+ delay(1000);
+ }
+ Serial.print(F("\tWIFI protocols = 0x"));Serial.println(cur_protocols,HEX);Serial.flush();
+ if( cur_protocols & WIFI_PROTOCOL_11N ) {
+ Serial.println(F("\t\tWiFi_Protocol_11n"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11G ) {
+ Serial.println(F("\t\tWiFi_Protocol_11g"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11B ) {
+ Serial.println(F("\t\tWiFi_Protocol_11b"));
+ }
+ return;
+}
+
+TO BE CONTINUED
+
+
+/*
+ * Setup
+ */
void setup() {
delay(3000); // time for USB serial link to come up anew
Serial.begin(115200); // Start serial for output
@@ -16,27 +65,33 @@ void setup() {
WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
// it is a good practice to make sure your code sets wifi mode how you want it.
-
+#ifdef SET_WIFI_PROTOCOL
+ Serial.println(F("\tsetting WiFi protocol ..."));Serial.flush();
+ // set WiFi mode 802.11b
+ //_err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G);
+ _err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B);
+ if( _err != ESP_OK ) {
+ //258 = ESP_ERR_INVALID_ARG
+ Serial.print("\tCould not set protocol! \terr_code: ");Serial.print(_err);Serial.flush();
+ delay(1000);
+ }
+ // esp_wifi_config_11b_rate(WIFI_IF_STA,true); // to suppress 802.11B if you set 802.11bg for example
+#endif
+
+ display_wifi_protocol();
+ delay(500);
+
//WiFiManager, Local intialization. Once its business is done, there is no need to keep it around
WiFiManager wm;
wm.setDebugOutput(true);
- // reset settings - wipe stored credentials for testing
- // these are stored by the esp library
- // wm.resetSettings();
-
- // Automatically connect using saved credentials,
- // if connection fails, it starts an access point with the specified name ( "AutoConnectAP"),
- // if empty will auto generate SSID, if password is blank it will be anonymous AP (wm.autoConnect())
- // then goes into a blocking loop awaiting configuration and will return success result
-
- Serial.println(F("\tconnection timeout to 5mn ...");
+ Serial.println(F("\tconnection timeout to 5mn ..."));
wm.setConnectTimeout(300);
bool res;
// res = wm.autoConnect(); // auto generated AP name from chipid
// res = wm.autoConnect("AutoConnectAP"); // anonymous ap
- res = wm.autoConnect(mySSID,mySSIDpw); // password protected ap
+ res = wm.autoConnect(ssid,passwd); // password protected ap
if(!res) {
Serial.println("Failed to connect");
@@ -49,7 +104,12 @@ void setup() {
}
+
+/*
+ * Loop
+ */
void loop() {
// put your main code here, to run repeatedly:
- Serial.print("+"); delay(1000);
+ Serial.print(".");
+ delay(1000);
}
diff --git a/tests/WiFi_simple/WiFi_simple.ino b/tests/WiFi_simple/WiFi_simple.ino
new file mode 100644
index 0000000000000000000000000000000000000000..08012c992f4dc27d0c49801ee22935d1c2c36be6
--- /dev/null
+++ b/tests/WiFi_simple/WiFi_simple.ino
@@ -0,0 +1,125 @@
+/*
+ * Simple WiFi connect test intended to ESP32
+ * i.e NO WifiManager involved
+ *
+ * NOTE: WIFI PROTOCOL IS PERSISTENT ACROSS REBOOT and FLASH !!
+ */
+
+#if !defined(ESP32)
+#error "Wrong architecture ... ought to be ESP32"
+#endif
+
+#include <Arduino.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
+#include <esp_log.h>
+
+// Defines
+#define SET_WIFI_PROTOCOL 1
+
+/* Global variables */
+const char* ssid = "neOCampus";
+const char* password = "XXXXXXX";
+esp_err_t _err;
+
+
+/* Functions */
+void display_wifi_protocol( wifi_interface_t ifx=WIFI_IF_STA ) {
+
+ uint8_t cur_protocols;
+ _err = esp_wifi_get_protocol(ifx, &cur_protocols);
+ if( _err != ESP_OK ) {
+ Serial.println("Could not get protocol!");
+ //log_e("Could not get protocol! %d", _err);
+ delay(1000);
+ }
+ Serial.print(F("\tWIFI protocols = 0x"));Serial.println(cur_protocols,HEX);Serial.flush();
+ if( cur_protocols & WIFI_PROTOCOL_11N ) {
+ Serial.println(F("\t\tWiFi_Protocol_11n"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11G ) {
+ Serial.println(F("\t\tWiFi_Protocol_11g"));
+ }
+ if( cur_protocols & WIFI_PROTOCOL_11B ) {
+ Serial.println(F("\t\tWiFi_Protocol_11b"));
+ }
+ return;
+}
+
+
+/*
+ * Setup
+ */
+void setup(){
+ Serial.begin(115200);
+ delay(3000);
+
+ Serial.print(F("\n###\nConnecting to SSID "));Serial.println(ssid);Serial.flush();
+
+ /* WARNING: WiFi mode resets the protocol definition ...
+ * hence est_wifi_set_protocol is set AFTER */
+ WiFi.mode(WIFI_STA); // Optional
+ Serial.println(F("\nDefault WiFi protocols at startup"));
+ display_wifi_protocol();
+ delay(500);
+
+#ifdef SET_WIFI_PROTOCOL
+ Serial.println(F("\tsetting WiFi protocol ..."));Serial.flush();
+ // set WiFi mode 802.11b
+ //_err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G);
+ _err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B);
+ if( _err != ESP_OK ) {
+ //258 = ESP_ERR_INVALID_ARG
+ Serial.print("\tCould not set protocol! \terr_code: ");Serial.print(_err);Serial.flush();
+ delay(1000);
+ }
+ // esp_wifi_config_11b_rate(WIFI_IF_STA,true); // to suppress 802.11B if you set 802.11bg for example
+#endif
+
+ display_wifi_protocol();
+ delay(500);
+
+ Serial.println(F("\tChanging to AP mode ..."));
+ WiFi.mode(WIFI_AP);
+ display_wifi_protocol(WIFI_IF_AP);
+ delay(500);
+
+ Serial.println(F("\tSet WIFI_STA mode one more time ..."));
+ WiFi.mode(WIFI_STA); // Optional
+ display_wifi_protocol();
+ delay(500);
+
+ // Start connection
+ WiFi.begin(ssid, password);
+
+ uint8_t count=240;
+ while(WiFi.status() != WL_CONNECTED && count ){
+ Serial.print(".");
+ delay(250);
+ count--;
+ }
+
+ if( WiFi.status() != WL_CONNECTED ) {
+ Serial.println(F("Failed to connect ... let's restart ..."));
+ delay(2000);
+ ESP.restart();
+ }
+
+ //if you get here you have connected to the WiFi
+ Serial.println("connected ...yeey :)");
+
+ Serial.print("\nConnected to the WiFi network ");Serial.println(ssid);
+ Serial.print("Local ESP32 IP: ");
+ Serial.println(WiFi.localIP());
+}
+
+
+
+/*
+ * Loop
+ */
+void loop() {
+ // put your main code here, to run repeatedly:
+ Serial.print(".");
+ delay(1000);
+}