Merge branch 'development' into ota

This commit is contained in:
tablatronix
2020-12-08 12:59:00 -06:00
5 changed files with 458 additions and 65 deletions
+441 -62
View File
File diff suppressed because it is too large Load Diff
+10
View File
@@ -586,6 +586,16 @@ class WiFiManager
// build debuglevel support
// @todo use DEBUG_ESP_x?
// Testing debug level memory
#ifndef WM_DEBUG_LEVEL
#define WM_DEBUG_LEVEL DEBUG_DEV
#endif
#ifdef WM_NODEBUG
#undef WM_DEBUG_LEVEL
#endif
#ifdef WM_DEBUG_LEVEL
uint8_t _debugLevel = (uint8_t)WM_DEBUG_LEVEL;
#else
+2 -2
View File
@@ -1,5 +1,5 @@
{
"name": "WifiManager",
"name": "WiFiManager",
"keywords": "wifi,wi-fi,esp,esp8266,esp32,espressif8266,espressif32,nodemcu,wemos,arduino",
"description": "WiFi Configuration manager with web configuration portal for ESP boards",
"authors":
@@ -25,5 +25,5 @@
"espressif8266",
"espressif32"
],
"version": "2.0.3-alpha"
"version": "2.0.4-beta"
}
+1 -1
View File
@@ -1,5 +1,5 @@
name=WiFiManager
version=2.0.3-alpha
version=2.0.4-beta
author=tzapu,tablatronix
maintainer=tablatronix
sentence=WiFi Configuration manager with web configuration portal for ESP boards
+4
View File
@@ -101,6 +101,7 @@ const char HTTP_STYLE[] PROGMEM = "<style>"
"input:disabled {opacity: 0.5;}"
"</style>";
#ifndef WM_NOHELP
const char HTTP_HELP[] PROGMEM =
"<br/><h3>Available Pages</h3><hr>"
"<table class='table'>"
@@ -127,6 +128,9 @@ const char HTTP_HELP[] PROGMEM =
"<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/>More information about WiFiManager at <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>";