Ukladani default konfigurace je funkcni, odstranena obsolete funkcnost

Reviewed-on: #8

examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino

@@ -1,20 +1,43 @@
+#if defined(ARDUINO_ARCH_ESP8266)
 #  include <ESP8266WiFi.h>
 #  include <ESP8266WebServer.h>
+#  include <ESP8266NetBIOS.h>
+#else
+#  include <WiFi.h>
+#  include <WebServer.h>
+#  include <NetBIOS.h>
+#endif
 #include <ArduinoOTA.h>
 #include <EEPROM.h>
-#include <ESP8266NetBIOS.h>
 #include <WiFiConfig.h>
+#include <encipheredEEPROMStrings.h>
+
+#define EEPROM_MAGIC 0xdeadbeef
 
 // Plati pro desticku Witty s modulem ESP-12E
 #define PIN_FORCE_CONFIG 4
-#define PIN_LED_RED 15
-#define PIN_LED_GREEN 12
-#define PIN_LED_BLUE 13
 
 //#define DEBUG_OUT(a) {}
 #define DEBUG_OUT(a) Serial.print(a)
 
+// Definice obsazeni EEPROM
+#define elementSize(type, element) sizeof(((type *)0)->element)
+#define countof(a) (sizeof(a) / sizeof(a[0]))
+typedef struct {
+    uint32_t magic; // kontrola spravneho obsahu EEPROM
+    char devname[32 + 2]; // jmeno zarizeni (pro NBNS plati jen 16 znaku)
+} eepromconfig_t;
+
+#define EEPROM_SIZE (sizeof(wificonfigarea_t) + sizeof(eepromconfig_t) + 10) // velikost EEPROM oblasti (POZOR!!! zbytecnym zvetsovanim se zaroven zmensuje velikost RAM kvuli zrcadlu!!!)
+#define EEPROM_WIFICONFIG_ORIGIN (EEPROM_SIZE - sizeof(wificonfigarea_t)) // pocatek oblasti, pouzivane WiFiConfig (alokovano odzadu)
+#define EEPROM_CONFIG_ORIGIN (0)
+
+char WiFiDeviceName[elementSize(eepromconfig_t, devname)]; // misto pro jmeno zarizeni (dodane do DNS, DHCP NBNS apod...)
+#if defined(ARDUINO_ARCH_ESP8266)
 ESP8266WebServer wwwserver(80); // webovy server
+#else
+WebServer wwwserver(80); // webovy server
+#endif
 String content;
 
 static void handleRoot(void)
@@ -30,8 +53,7 @@ static void handleRoot(void)
 void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
 {
 
-  switch (state)
+    switch (state) {
-  {
     case WCS_CONNECTSTART:
         DEBUG_OUT(F("Starting connect...\r\n"));
         break;
@@ -49,33 +71,53 @@ void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
 
     case WCS_CONFIGWAIT:
         break;
+
+    case WCS_CONFIGTIMEOUT:
+        DEBUG_OUT(F("Config timeout...\r\n"));
+        break;
     }
 }
 
-void saveServer(const char *param)
+void ICACHE_FLASH_ATTR saveDevname(const char *param)
 {
+    String p = param;
 
-  DEBUG_OUT(param);
+    EES_storeString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname), p);
 }
 
 void ICACHE_FLASH_ATTR setup()
 {
     WiFiConfig wifi; // konfigurace ESP modulu
-  WiFiConfigUsrParameter testOnly("server", "adresa serveru", "Default server", 32, saveServer);
+    WiFiConfigUsrParameter devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname);
+
+    EEPROM.begin(EEPROM_SIZE); // zahajujeme praci s EEPROM
+
+    uint32_t magic;
+
+    EEPROM.get(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
+    if (EEPROM_MAGIC != magic) {
+        // EEPROM ma spatny obsah
+        for (unsigned int i = 0; i < EEPROM_SIZE; i++)
+            EEPROM.write(i, 0);
+        magic = EEPROM_MAGIC;
+        EEPROM.put(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
+        EEPROM.commit();
+    }
 
-  EEPROM.begin(512); // zahajujeme praci s EEPROM
     pinMode(PIN_FORCE_CONFIG, INPUT_PULLUP); // pin, co slouzi jako vstup tlacitka
     int fc = digitalRead(PIN_FORCE_CONFIG); // pozadavek na vynucene vyvolani konfigurace
-  Serial.begin(9600);
+    Serial.begin(115200);
-  wifi.addParameter(&testOnly);
+    String dn = EES_readString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname));
-  if (WCR_OK != wifi.begin(0, fc, wcb)) // startujeme pripojeni
+    strcpy(WiFiDeviceName, dn.c_str());
+    wifi.addParameter(&devname);
+
+    if (WCR_OK != wifi.begin(EEPROM_WIFICONFIG_ORIGIN, fc, wcb)) // startujeme pripojeni
         ESP.restart();
 
     wwwserver.on("/", handleRoot);
     wwwserver.begin(); // startujeme webovy server
 
-  if (strlen(WiFiDeviceName) > 0)
+    if (strlen(WiFiDeviceName) > 0) {
-  {
         NBNS.begin(WiFiDeviceName);
         ArduinoOTA.setHostname(WiFiDeviceName);
     }
@@ -90,8 +132,7 @@ void ICACHE_FLASH_ATTR setup()
         DEBUG_OUT(F("Error["));
         DEBUG_OUT(error);
         DEBUG_OUT(F("]: "));
-    switch (error)
+        switch (error) {
-    {
         case OTA_AUTH_ERROR:
             DEBUG_OUT(F("Auth Failed\r\n"));
             break;

library.json

@@ -10,9 +10,9 @@
   "repository":
   {
     "type": "git",
-    "url": "http://git.xpablo.cz/pablo2048/WiFiConfig.git"
+    "url": "https://git.xpablo.cz/pablo2048/WiFiConfig.git"
   },
-  "version": "6.0",
+  "version": "6.4.0",
   "license": "MIT",
   "frameworks": "arduino",
   "platforms": ["espressif8266", "espressif32"],

library.properties

@@ -1,9 +1,9 @@
 name=WiFiConfig
-version=6.0
+version=6.4.0
 author=Pavel Brychta
-maintainer=Pavel Brychta <Pablo@xpablo.cz>
+maintainer=Pavel Brychta <pablo@xpablo.cz>
 sentence=Enables seamless module configuration.
 paragraph=With this library you can enable your ESP8266 or ESP32 module to be configured over WiFi. Includes Captive Portal for easy configuration.
 category=Other
-url=http://www.xpablo.cz
+url=https://www.xpablo.cz
 architectures=esp8266,esp32

src/WiFiConfig.cpp

@@ -1,4 +1,25 @@
 /*
+ * v6.4.0- 27.2.2021 - funkcni inicializace konfigurace
+ *
+ * v6.3.5-28.11.2020 - moznost nadefinovat titulek webove stranky a popisek okna v prohlizeci pomoci WIFICONFIG_TITLE a WIFICONFIG_WEBTITLE
+ *
+ * v6.3.4-23.3.2020 - staticka konfigurace v AP rezimu funkcni
+ *
+ * v6.3.3-27.10.2019 - volani WS_CONNECTED i v pripade, ze bezi AP
+ *
+ * v6.3.2- 4.10.2019 - Informace o aplikaci a jeji verzi do footeru, zrychlen restart z 10 na 5 sekund, vylepsena stranka pro reset
+ *                      verze pro ESP32 zobrazuje neco malo informaci o stavu pripojeni a duvodu vstupu do WifiConfig
+ *
+ * V6.3.1- 1.9.2019 - Odstraneni HTML5 validatoru - delaly akorat problemy a nedala se ulozit konfigurace i kdyz byly polozky skryty
+ *
+ * V6.3 - 12.8.2019 - IP adresa Captive portalu je zmenena na 172.217.28.1 kvuli funkcnosti na Android zarizenich (viz. zmena zde https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino)
+ *             ladici vypis pri zachyceni presmerovani v Captive portalu.
+ *
+ * V6.2 - 12.12.2018- Nastaveni jmena zarizeni nadale NENI soucasti WiFiConfig a je treba ho pridat jako uzivatelsky parametr. Je to proto, protoze
+ *             se ukazalo, ze neni dobre z externiho kodu sahat do vnitrni struktury WiFiConfig (napr. pri ukladani noveho jmena).
+ *
+ * V6.1 - 11.12.2018- Sifrovani retezcu vytazeno mimo WiFiConfig do knihovny encipheredEEPROMStrings (dostupna na gitu) kvuli pristupu i jinych modulu
+ *
  * V6.0 - 20.11.2018- Verze i pro ESP32
  *
  * V5.9 - 18.7.2018 - Retezce, ukladane do EEPROM jsou primitivnim zpusobem sifrovany pro ztizeni odhaleni SSID a hesla pri dumpu pameti
@@ -16,7 +37,7 @@
  *
  * V5.3 - 8.12.2017 - prepracovano presmerovani v Captive portalu, DEBUG_MSG makro upraveno na posledni pouzivanou verzi, scitani retezcu prepracovano na .concat. Pripsany Informace o modulu, reakce na Reset
  *
- * V5.2 - 20.4.2017 - Pokud je pouzite v timeoutu EC_DONT_RUN_CONFIGAP tak se vracime okamzite a necekame na pripojeni k WiFi (take nevolame zadnou callback metodu).
+ * V5.2 - 20.4.2017 - Pokud je pouzite v timeoutu WC_DONT_RUN_CONFIGAP tak se vracime okamzite a necekame na pripojeni k WiFi (take nevolame zadnou callback metodu).
  *            Navratovy kod je pak WCR_CONFIGAP_NOT_STARTED .
  *
  * V5.1 - 3.4.2017  - Webove rozhrani upravene pro snadnejsi ovladani na telefonu/tabletu, sila signalu AP zobrazena jako barevne odliseny indikator.
@@ -74,12 +95,22 @@
 # include <ESP8266WebServer.h>
 #else
 # include <WebServer.h>
+# include <rom/rtc.h> // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449)
 #endif
 #include "WiFiConfig.h"
 #include <EEPROM.h>
 #include <Ticker.h>
+#include <encipheredEEPROMStrings.h>
 #include "embHTML.h"
 
+#if defined(ESP8266)
+// ESP8266
+# define SETHOSTNAME(a) WiFi.hostname(a)
+#else
+// ESP32
+# define SETHOSTNAME(a) WiFi.setHostname(a)
+#endif
+
 #ifdef DEBUG_ESP_PORT
 # define DEBUG_MSG(_1, ...) DEBUG_ESP_PORT.printf_P(PSTR(_1), ##__VA_ARGS__)
 #else
@@ -98,20 +129,7 @@
 
 #define DNS_PORT 53
 
-char WiFiDeviceName[elementSize(wificonfigarea_t, devname)]; // misto pro jmeno zarizeni (dodane do DNS, DHCP NBNS apod...)
+extern char WiFiDeviceName[];
-
-enum
-{
-	WIFIMODE_AP = WIFI_AP, // rezim prace jako pristupovy bod (AP)
-	WIFIMODE_STA = WIFI_STA, // rezim prace jako klient
-	WIFIMODE_AP_STA = WIFI_AP_STA // rezim prace jako klient i pristupovy bod
-};
-
-enum
-{
-	IPCONFIG_DHCP = 0x55, // DHCP konfigurace ip adres (default)
-	IPCONFIG_STATIC = 0xaa // staticka konfigurace ip adres
-};
 
 static int configBase; // musi byt trvale ulozene, aby fungovaly metody pro ziskani retezcu z EEPROM
 
@@ -131,8 +149,7 @@ IPAddress getOurIP(void)
     IPAddress ipa;
     WiFiMode_t wm = WiFi.getMode();
 
-	switch (wm)
+    switch (wm) {
-	{
     case WIFI_STA:
         ipa = WiFi.localIP();
         break;
@@ -161,8 +178,7 @@ uint32_t getEEPROMuint32(unsigned int start)
 {
     uint32_t result = 0;
 
-	for (uint32_t i=0; i<4; ++i)
+    for (uint32_t i = 0; i < 4; ++i) {
-	{
         result <<= 8;
         result += EEPROM.read(start);
         ++start;
@@ -173,8 +189,7 @@ uint32_t getEEPROMuint32(unsigned int start)
 void setEEPROMuint32(unsigned int start, uint32_t val)
 {
 
-	for (unsigned int i=0; i<4; ++i)
+    for (unsigned int i = 0; i < 4; ++i) {
-	{
         EEPROM.write(start + 3 - i, (uint8_t)val);
         val >>= 8;
     }
@@ -184,8 +199,7 @@ String getEEPROMString(unsigned int start, size_t len)
 {
     String string = "";
 
-  for (unsigned int i = start; i < + start + len; ++i)
+    for (unsigned int i = start; i < + start + len; ++i) {
-  {
         uint8_t b = EEPROM.read(i);
 
         if ((0xff == b) || (0 == b))
@@ -199,16 +213,12 @@ void setEEPROMString(unsigned int start, size_t len, String &string)
 {
     unsigned int si = 0;
 
-  for (unsigned int i = start; i < start + len; ++i)
+    for (unsigned int i = start; i < start + len; ++i) {
-  {
         char c;
 
-    if (si < string.length())
+        if (si < string.length()) {
-    {
             c = string[si];
-    }
+        } else {
-    else
-    {
             c = 0;
         }
         EEPROM.write(i, c);
@@ -224,12 +234,10 @@ WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label
     _label = label;
     _length = length;
     _value = new char[length + 1];
-  for (unsigned int i = 0; i < length; i++)
+    for (unsigned int i = 0; i < length; i++) {
-  {
         _value[i] = 0;
     }
-  if (defaultValue != NULL)
+    if (defaultValue != NULL) {
-  {
         strncpy(_value, defaultValue, length);
     }
 }
@@ -281,8 +289,7 @@ WiFiConfigUsrParameter *WiFiConfig::_searchUsrParameter(const char *name)
 {
     WiFiConfigUsrParameter *ptr = _params;
 
-  while (NULL != ptr)
+    while (NULL != ptr) {
-  {
         if (0 == strcmp(name, ptr->getID()))
             break;
         ptr = ptr->getNext();
@@ -301,13 +308,16 @@ void WiFiConfig::_handleNotFound(void)
 
     DEBUG_MSG("Requested URI: %s\r\n", server->uri().c_str());
 
-	if (server->uri().endsWith(String(F("favicon.ico"))))
+    if (server->uri().endsWith(String(F("favicon.ico")))) {
-	{
         server->send_P(404, TEXTPLAIN, PSTR("Err"));
-	}
+    } else {
-  else
+        String redirect;
-	{
+        redirect.reserve(256);
-    	server->sendHeader(F("Location"), String(F("http://")) + server->client().localIP().toString() + String(F("/index.htm")), true);
+        redirect = F("http://");
+        redirect.concat(server->client().localIP().toString());
+        redirect.concat(F("/index.htm"));
+        DEBUG_MSG("Redirection to: %s\r\n", redirect.c_str());
+        server->sendHeader(F("Location"), redirect, true);
         server->send_P(302, TEXTPLAIN, PSTR("Redirect"));
     }
 }
@@ -317,8 +327,7 @@ void WiFiConfig::_handleReset(void)
 
     rsttick.reset(new(Ticker));
 
-  rsttick->once_ms(700, []()
+    rsttick->once_ms(700, []() {
-  {
         ESP.restart();
     });
 
@@ -382,11 +391,6 @@ void WiFiConfig::_handleInfo(void)
     reply.concat(buff);
 #endif
 
-  reply.concat(F("<TR><TD>Timeout:<TD>"));
-  reply.concat(_timeout);
-  reply.concat(F("/"));
-  reply.concat(_time);
-
 #if defined(ESP8266)
     uint8_t stations = wifi_softap_get_station_num();
 
@@ -407,8 +411,7 @@ void WiFiConfig::_handleRoot(void)
 // pridame informaci o stavu pokusu o pripojeni
     content.concat(F("<div class=\"vl-info\">Pokus o připojení: "));
 #if defined(ESP8266)
-  switch (_status)
+    switch (_status) {
-  {
     case STATION_IDLE:
         content.concat(F("Klid"));
         break;
@@ -446,7 +449,23 @@ void WiFiConfig::_handleRoot(void)
         break;
     }
 #else
-  content.concat(F("Prozatím nedostupné"));
+    switch (_status) {
+    case WL_CONNECT_FAILED:
+        content.concat(F("Připojení selhalo"));
+        break;
+
+    case 0xfe:
+        content.concat(F("Špatná EEPROM"));
+        break;
+
+    case 0xff:
+        content.concat(F("Vynucená konfigurace"));
+        break;
+
+    default:
+        content.concat(F("Neznámý"));
+        break;
+    }
 #endif
     content.concat(F("</div>"));
     content.concat(FPSTR(PAGE_CAPTIVEPORTALCATCH2)); // 2. cast stranky (ukonceni)
@@ -464,14 +483,10 @@ void WiFiConfig::_handleDisplayAP(void)
     content.reserve(3000);
     content = FPSTR(PAGE_INDEX1);
     int n = WiFi.scanNetworks();
-	if (0 == n)
+    if (0 == n) {
-	{
         content.concat(FPSTR(PAGE_NO_SSID));
-	}
+    } else {
-	else
+        for (int i = 0; i < n; ++i) {
-	{
-		for (int i = 0; i < n; ++i)
-		{
             int quality;
 
             if (WiFi.RSSI(i) <= -100)
@@ -493,21 +508,16 @@ void WiFiConfig::_handleDisplayAP(void)
         }
     }
     s = FPSTR(PAGE_INDEX2);
-	v = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
+    v = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
     if (v.length())
         s.replace(F("{s}"), String(FPSTR(VALUE)) + v + F("'"));
     else
-		s.replace(F("{s}"), F("placeholder='SSID'"));
+        s.replace(F("{s}"), F(""));
-	v = _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
+    v = EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
     if (v.length())
         s.replace(F("{p}"), String(FPSTR(VALUE)) + v + F("'"));
     else
-		s.replace(F("{p}"), F("placeholder='password'"));
+        s.replace(F("{p}"), F(""));
-	v = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
-	if (v.length())
-		s.replace(F("{n}"), String(FPSTR(VALUE)) + v + F("'"));
-	else
-		s.replace(F("{n}"), F("placeholder='name'"));
     if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) == WIFIMODE_AP)
         s.replace(F("{a}"), FPSTR(CHECKED));
     else
@@ -529,15 +539,13 @@ void WiFiConfig::_handleDisplayAP(void)
     content.concat(s);
 
 // Uzivatelske parametry
-	if (_params)
+    if (_params) {
-	{
         content.concat(FPSTR(PAGE_PARAM_HDR));
     }
 
     WiFiConfigUsrParameter *up = _params;
 
-	while (NULL != up)
+    while (NULL != up) {
-	{
         s = FPSTR(PAGE_PARAM);
         s.replace(F("{t}"), up->getLabel());
         s.replace(F("{n}"), up->getID());
@@ -558,32 +566,26 @@ void WiFiConfig::_handleSetAP(void)
 
     str.reserve(128);
     str = server->arg(F("_s"));
-	if (str.length() > 0)
+    if (str.length() > 0) {
-	{
+        EES_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str);
-		_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str);
 
         str = server->arg(F("_p"));
-		_storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str);
+        EES_storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str);
-
-		str = server->arg(F("_n"));
-		_storeString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname), str);
 
         str = server->arg(F("_a"));
-		if (str.length() > 0)
+        if (str.length() > 0) {
-		{
             mode = WIFIMODE_AP; // rezim AP
             str = server->arg(F("_ch")); // kanal AP
             EEPROM.write(configBase + offsetof(wificonfigarea_t, apchannel), (uint8_t)str.toInt());
-		}
+        } else
-		else
             mode = WIFIMODE_STA; // rezim STA
         EEPROM.write(configBase + offsetof(wificonfigarea_t, mode), mode);
 
         str = server->arg(F("_st"));
         if (0 == str.length())
             EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_DHCP); // mame DHCP dynamickou konfiguraci
-		else
+        else {
-		{ // staticka ip konfigurace
+            // staticka ip konfigurace
             IPAddress ipa;
 
             EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_STATIC);
@@ -605,10 +607,8 @@ void WiFiConfig::_handleSetAP(void)
         }
 
 // Uzivatelske parametry
-		for (int i = 0; i < server->args(); i++)
+        for (int i = 0; i < server->args(); i++) {
-		{
+            if (!server->argName(i).startsWith(F("_"))) { // vnitrni parametry WiFiConfig modulu zacinaji _, takze ty muzeme ignorovat
-			if (!server->argName(i).startsWith(F("_"))) // vnitrni parametry WiFiConfig modulu zacinaji _, takze ty muzeme ignorovat
-			{
                 WiFiConfigUsrParameter *up = _searchUsrParameter(server->argName(i).c_str());
                 if (NULL != up)
                     up->setNewValue(server->arg(i).c_str());
@@ -619,76 +619,7 @@ void WiFiConfig::_handleSetAP(void)
     server->send_P(200, TEXTHTML, PAGE_SAVED);
     delay(2000); // cekame na odeslani dat
 // nakonfigurujeme ESP dle nove nastavenych parametru
-	WiFi.disconnect(); // vsechno odpojime
+    _prepareWifi();
-	WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci
-
-	String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
-	strcpy(WiFiDeviceName, s.c_str());
-	s = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
-	String pass =  _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
-
-	switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
-	{
-		case WIFIMODE_STA:
-		{
-			DEBUG_MSG("STA mode.\r\n");
-#if defined(ESP8266)
-      if (strlen(WiFiDeviceName))
-			{
-        WiFi.hostname(WiFiDeviceName); // nastavime jmeno zarizeni
-			}
-#endif
-			if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-			{
-				DEBUG_MSG("Static configuration.\r\n");
-				WiFi.config(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
-					IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))));
-        delay(100);
-			}
-      WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
-      WiFi.begin(s.c_str(), pass.c_str());
-#if !defined(ESP8266)
-      if (strlen(WiFiDeviceName))
-      {
-        WiFi.setHostname(WiFiDeviceName); // nastavime jmeno zarizeni
-      }
-#endif
-#if defined(ESP8266)
-			wifi_station_set_auto_connect(true);
-#else
-      //esp_wifi_set_auto_connect(true);
-#endif
-
-      delay(1000);
-		}
-		break;
-
-		case WIFIMODE_AP:
-			DEBUG_MSG("AP mode.\r\n");
-			WiFi.mode(WIFI_AP); // startujeme AP
-			if (pass.length())
-      {
-			  // je zadane heslo do AP
-				WiFi.softAP(s.c_str(), pass.c_str(), EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
-      }
-			else
-      {
-			  // otevreny AP
-			  WiFi.softAP(s.c_str(), NULL, EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
-      }
-			if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-      {
-				WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
-					IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
-      }
-		break;
-
-		default: // jakykoliv neznamy rezim (mozna zavada na EEPROM???)
-			DEBUG_MSG("Mode Error!!\r\n");
-		break;
-	}
-
-	delay(1000); // cekame XX sekund na ulozeni atd...
     ESP.restart();
 }
 
@@ -706,27 +637,35 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
 #endif
 
     /* Soft AP network parameters */
-	IPAddress apIP(192, 168, 4, 1);
+    IPAddress apIP(172, 217, 28, 1);
     IPAddress netMsk(255, 255, 255, 0);
 
     WiFi.disconnect(); // pro jistotu se odpojime
-	WiFi.mode(WIFI_AP);
+//    WiFi.mode(WIFI_AP);
 
+#if defined(ARDUINO_ARCH_ESP8266)
     WiFi.softAPConfig(apIP, apIP, netMsk);
-	if (ssid.endsWith(F("?")))
+    if (ssid.endsWith(F("?"))) {
-	{
-  		//uint8_t amac[6];
         char lmac[16];
 
-  		//WiFi.softAPmacAddress(amac);
-  		//sprintf_P(lmac, PSTR("%02X%02X%02X"), amac[3], amac[4], amac[5]);
-
         sprintf_P(lmac, PSTR("%06X"), ESP_getChipId());
         ssid.replace(F("?"), String(lmac));
     }
     WiFi.softAP(ssid.c_str(), NULL, SETUP_CHANNEL);
+    WiFi.mode(WIFI_AP);
     delay(500); // dulezite - jinak se nevraci spravna IP adresa !!! (udajne od verze 2.3.0 uz neni nutne)
+#else
+    // osetreni padu ESP32 - https://github.com/espressif/arduino-esp32/issues/2025
+    if (ssid.endsWith(F("?"))) {
+        char lmac[16];
 
+        sprintf_P(lmac, PSTR("%06X"), ESP_getChipId());
+        ssid.replace(F("?"), String(lmac));
+    }
+    WiFi.softAP(ssid.c_str(), NULL, SETUP_CHANNEL);
+    delay(100); // kvuli ESP32 - cekame na start AP
+    WiFi.softAPConfig(apIP, apIP, netMsk);
+#endif
     dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
     dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); // spustime tzv. Captive portal - vsechny DNS dotazy jsou smerovany na nasi ip adresu
     if (cb)
@@ -738,18 +677,45 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
     server->on(F("/r"), std::bind(&WiFiConfig::_handleReset, this));
     server->on(F("/i"), std::bind(&WiFiConfig::_handleInfo, this));
     server->on(F("/index.htm"), std::bind(&WiFiConfig::_handleRoot, this));
+#ifdef USE_WIFICONFIG_OTAUPDATE
+    server->on(F("/u"), []() {
+        server->send_P(200, TEXTHTML, PAGE_UPDATE);
+    });
+    server->on(F("/update"), HTTP_POST, []() {
+        server->sendHeader(F("Connection"), F("close"));
+        server->send(200, FPSTR(TEXTPLAIN), (Update.hasError()) ? F("FAIL") : F("OK"));
+        ESP.restart();
+    }, []() {
+        HTTPUpload& upload = server->upload();
+        if (upload.status == UPLOAD_FILE_START) {
+            WiFiUDP::stopAll();
+            uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+            if (!Update.begin(maxSketchSpace)) { //start with max available size
+                //Update.printError(Serial);
+            }
+        } else if (upload.status == UPLOAD_FILE_WRITE) {
+            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);
+            }
+        }
+        yield();
+    });
+#endif
     server->begin(); // startujeme webovy server
-	while (1)
+    while (1) {
-	{
         server->handleClient(); // osetrujeme praci serveru
         if (cb)
             cb(WCS_CONFIGWAIT); // volame uzivatelsky callback (napr. signalizace)
         dnsServer->processNextRequest();
         yield(); // procesy uvnitr systemu ESP potrebuji take svuj cas
-		if (_timeout)
+        if (_timeout) {
-		{
+            if (millis() > _time) {
-			if (millis() > _time)
-			{
                 DEBUG_MSG("AP timeout\r\n");
                 if (cb)
                     cb(WCS_CONFIGTIMEOUT); // signalizujeme timeout
@@ -763,80 +729,6 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
     return WCR_TIMEOUT; // nepripojeno, vyprsel timeout konfiguracniho AP
 }
 
-String WiFiConfig::_readString(unsigned int start, size_t maxlen)
-{
-  uint8_t key[4];
-  unsigned int enciphidx = 0;
-  String result;
-  unsigned int top = EEPROM.read(start);
-  unsigned int i;
-
-  result.reserve(maxlen);
-  uint32_t cid = ESP_getChipId();
-  uint32_t *pkey = (uint32_t *)&key[0];
-  *pkey = cid;
-  DEBUG_MSG("Key = %02X:%02X:%02X:%02X\r\n", key[0], key[1], key[2], key[3]);
-  if ((top > 0) && (top < (maxlen - 2)))
-  {
-    uint8_t b;
-    for (i = start + 1; i < + start + top + 1; ++i)
-    {
-      b = EEPROM.read(i);
-
-      b ^= key[enciphidx];
-      ++enciphidx;
-      enciphidx %= sizeof(key);
-
-      result.concat(char(b));
-    }
-    b = EEPROM.read(i) ^ key[enciphidx];
-    if (b != 0)
-    {
-      DEBUG_MSG("_readString error! (%s)\r\n", result.c_str());
-      result = F(""); // spatna ukoncovaci nula - neplatny retezec
-    }
-  }
-  return result;
-}
-
-bool WiFiConfig::_storeString(unsigned int start, size_t maxlen, String &string)
-{
-  uint8_t key[4];
-  unsigned int enciphidx = 0;
-  unsigned int si = 0;
-  unsigned int top;
-  char c;
-  bool result = false; // retezec nebyl ulozeny cely (nevesel s do bufferu)
-  unsigned int i;
-
-  if (string.length() > maxlen - 2)
-    top = maxlen - 2;
-  else
-  {
-    result = true; // retezec se do urceneho mista vejde
-    top = string.length();
-  }
-
-  uint32_t cid = ESP_getChipId();
-  uint32_t *pkey = (uint32_t *)&key[0];
-  *pkey = cid;
-  DEBUG_MSG("Key = %02X:%02X:%02X:%02X\r\n", key[0], key[1], key[2], key[3]);
-  EEPROM.write(start, (uint8_t)top); // ulozime delku retezce (pouzite pr kontrolu pri vycitani)
-  for (i = start + 1; i < start + top + 1; ++i)
-  {
-    c = string[si];
-    c ^= key[enciphidx];
-    ++enciphidx;
-    enciphidx %= sizeof(key);
-    EEPROM.write(i, c);
-    ++si;
-  }
-  c = 0 ^ key[enciphidx];
-  EEPROM.write(i, c); // ukoncovaci a kontrolni nula
-
-  return result;
-}
-
 // Testovani, zda se modul pripojil k AP
 bool WiFiConfig::_testWifi(wificonfig_cb cb)
 {
@@ -846,18 +738,13 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
 // nakonfigurujeme ESP dle nove nastavenych parametru
     WiFi.disconnect(); // vsechno odpojime
 
-  String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
+    String s = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
-  strcpy(WiFiDeviceName, s.c_str());
+    String pass =  EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
-  s = _readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
-  String pass =  _readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
 
-  switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
+    switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode))) {
-  {
+    case WIFIMODE_STA: {
-    case WIFIMODE_STA:
-    {
         DEBUG_MSG("STA mode.\r\n");
-      if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
-      {
             DEBUG_MSG("Static configuration.\r\n");
             WiFi.config(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                         IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))));
@@ -866,8 +753,7 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
         WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
         WiFi.begin(s.c_str(), pass.c_str());
         DEBUG_MSG("STA params: %s, %s\r\n", s.c_str(), pass.c_str());
-      if (strlen(WiFiDeviceName))
+        if (strlen(WiFiDeviceName)) {
-      {
             WiFi.setHostname(WiFiDeviceName); // nastavime jmeno zarizeni
         }
     }
@@ -875,22 +761,27 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
 
     case WIFIMODE_AP:
         DEBUG_MSG("AP mode.\r\n");
+        if (s.endsWith(F("?"))) {
+            char lmac[16];
+
+            sprintf_P(lmac, PSTR("%06X"), ESP_getChipId());
+            s.replace(F("?"), String(lmac));
+        }
         WiFi.mode(WIFI_AP); // startujeme AP
-      if (pass.length())
+        if (pass.length()) {
-      {
             // je zadane heslo do AP
             WiFi.softAP(s.c_str(), pass.c_str(), EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
-      }
+        } else {
-      else
-      {
             // otevreny AP
             WiFi.softAP(s.c_str(), NULL, EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
         }
-      if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
-      {
+            delay(100); // kvuli ESP32 - cekame na start AP
             WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                               IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
         }
+        if (cb)
+            cb(WCS_CONNECTED);
         break;
 
     default: // jakykoliv neznamy rezim (mozna zavada na EEPROM???)
@@ -900,10 +791,8 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
 #endif
 
     DEBUG_MSG("Trying to connect.\r\n");
-	while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT)
+    while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT) {
-	{
+        if (WL_CONNECTED == WiFi.status()) {
-		if (WL_CONNECTED == WiFi.status())
-		{
             DEBUG_MSG("Connected...\r\n");
             if (cb)
                 cb(WCS_CONNECTED);
@@ -929,38 +818,24 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon
     DEBUG_MSG("\r\n\r\n"); // oddeleni vypisu
 
     configBase = configarea; // pocatek konfigurace v EEPROM
-	if (0 == forceConfigure)
+    if (0 == forceConfigure) {
-	{
         DEBUG_MSG("Force config.\r\n");
         _status = 0xff;
         result = _setupAP(cb);
-	}
+    } else {
-	else
-	{
 #if defined(ESP8266)
-		if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) != WiFi.getMode())
+        if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) != WiFi.getMode()) {
-		{ // neshoduje se rezim - musime spustit konfiguracni AP (poskozena konfigurace)
+            // neshoduje se rezim - musime spustit konfiguracni AP (poskozena konfigurace)
             DEBUG_MSG("Wrong config (%d, %d)\r\n", EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)), WiFi.getMode());
             _status = 0xfe;
             result = _setupAP(cb);
-		}
+        } else
-		else
 #endif
         {
-			String s = _readString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
+            switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode))) {
-			strcpy(WiFiDeviceName, s.c_str());
+            case WIFIMODE_STA: {
-
+                SETHOSTNAME(WiFiDeviceName); // nastavime jmeno zarizeni
-			switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
+                if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
-			{
-			case WIFIMODE_STA:
-			{
-#if defined(ESP8266)
-				WiFi.hostname(WiFiDeviceName); // nastavime jmeno zarizeni
-#else
-        WiFi.setHostname(WiFiDeviceName);
-#endif
-				if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-				{
                     DEBUG_MSG("Static configuration SET.\r\n");
                     WiFi.config(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                                 IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))));
@@ -968,12 +843,10 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon
                 DEBUG_MSG("STA mode.\r\n");
                 if (WC_DONT_RUN_CONFIGAP == _timeout)
                     result = WCR_CONFIGAP_NOT_STARTED; // nemame spoustet konfiguracni AP - vracime se hned
-				else
+                else {
-				{
                     if (cb)
                         cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni
-					if (!_testWifi(cb))
+                    if (!_testWifi(cb)) {
-					{
                         result = _setupAP(cb); // modul se nepripojil - startujeme AP rezim
                     }
                 }
@@ -982,9 +855,21 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon
 
             case WIFIMODE_AP:
                 DEBUG_MSG("AP mode.\r\n");
+                if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
+                    WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
+                              IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
+                }
                 if (cb)
-					cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni (zde se nic jineho stejne nestane...)
+                    cb(WCS_CONNECTED); // signalizujeme pripojeni (zde se nic jineho stejne nestane...)
                 break;
+
+#if !defined(ESP8266)
+            default:
+                DEBUG_MSG("Wrong config (%d)\r\n", EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)));
+                _status = 0xfe;
+                result = _setupAP(cb);
+                break;
+#endif
             }
         }
     }
@@ -996,9 +881,98 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, int tim
 
     if ((timeout > 0) && (40 > timeout))
         timeout = 40; // timeout musi byt minimalne 40 sekund
+    if ((0 == forceConfigure) && (WC_DONT_RUN_CONFIGAP == timeout))
+        timeout = 40;
     _timeout = timeout;
     if (_timeout > 0)
         _time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat
     return begin(configarea, forceConfigure, cb); // spustime WiFi
 }
+
+void WiFiConfig::initConfig(int cfgBase, const String &ssid, const String &pass, const int mode, const int ipcfg, const IPAddress &ip, const IPAddress &mask, const IPAddress &gw, const IPAddress &dns)
+{
+
+    DEBUG_MSG("initConfig %d\r\n", mode);
+    configBase = cfgBase;
+    EES_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), (String &)ssid);
+    EES_storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), (String &)pass);
+    EEPROM.write(configBase + offsetof(wificonfigarea_t, mode), mode);
+    EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), ipcfg);
+    EEPROM.write(configBase + offsetof(wificonfigarea_t, apchannel), 3);
+    setEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr), (uint32_t) ip);
+    setEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask), (uint32_t) mask);
+    setEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway), (uint32_t) gw);
+    setEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns), (uint32_t) dns);
+    DEBUG_MSG("IP: %s\r\n", ip.toString().c_str());
+    EEPROM.commit(); // ulozime zmeny v EEPROM
+    _prepareWifi(); // nastavime novou WiFi konfiguraci
+}
+
+void WiFiConfig::_prepareWifi(void)
+{
+
+    WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci
+    WiFi.disconnect(); // vsechno odpojime
+    delay(100);
+
+    String s = EES_readString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
+    String pass =  EES_readString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass));
+    uint8_t mode = EEPROM.read(configBase + offsetof(wificonfigarea_t, mode));
+
+    switch (mode) {
+    case WIFIMODE_STA: {
+        DEBUG_MSG("STA mode.\r\n");
+#if defined(ESP8266)
+        if (strlen(WiFiDeviceName)) {
+            SETHOSTNAME(WiFiDeviceName); // nastavime jmeno zarizeni
+        }
+#endif
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
+            DEBUG_MSG("Static configuration.\r\n");
+            WiFi.config(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
+                        IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))));
+            delay(100);
+        }
+        WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
+        WiFi.begin(s.c_str(), pass.c_str());
+        DEBUG_MSG("STA params: %s, %s\r\n", s.c_str(), pass.c_str());
+#if !defined(ESP8266)
+        if (strlen(WiFiDeviceName)) {
+            SETHOSTNAME(WiFiDeviceName); // nastavime jmeno zarizeni
+        }
+#endif
+#if defined(ESP8266)
+        WiFi.setAutoConnect(true);
+        WiFi.setAutoReconnect(true);
+//        wifi_station_set_auto_connect(true);
+#else
+        //esp_wifi_set_auto_connect(true);
+#endif
+        delay(1000);
+    }
+    break;
+
+    case WIFIMODE_AP:
+        DEBUG_MSG("AP mode.\r\n");
+        WiFi.mode(WIFI_AP); // startujeme AP
+        if (pass.length()) {
+            // je zadane heslo do AP
+            WiFi.softAP(s.c_str(), pass.c_str(), EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
+        } else {
+            // otevreny AP
+            WiFi.softAP(s.c_str(), NULL, EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
+        }
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
+            WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
+                              IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
+        }
+        break;
+
+    default: // jakykoliv neznamy rezim (mozna zavada na EEPROM???)
+        DEBUG_MSG("Mode Error (%d)!!\r\n", (int)mode);
+        break;
+    }
+
+    delay(1000); // cekame XX sekund na ulozeni atd...
+}
 // EOF

src/WiFiConfig.h

@@ -2,7 +2,7 @@
  * @file WiFiConfig.h
  * @author Pavel Brychta, http://www.xpablo.cz
  *
- * Copyright (c) 2015-18 Pavel Brychta. All rights reserved.
+ * Copyright (c) 2015-21 Pavel Brychta. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -42,13 +42,11 @@
 #define WC_DONT_RUN_CONFIGAP -1 // priznak, ze si neprejeme spoustet konfiguracni AP (uziva se misto parametru timeout). Urceno pro bateriove napajene pristroje
 
 // Struktura konfigurace, ulozena v EEPROM
-typedef struct
+typedef struct {
-{
     uint8_t mode; // rezim prace AP/STA
     uint8_t ip; // konfigurace ip (staticka/DHCP)
     char ssid[32 + 2]; // SSID site
     char pass[64 + 2]; // heslo
-	char devname[32 + 2]; // jmeno zarizeni (pro NBNS plati jen 16 znaku)
     uint32_t ipaddr; // ip adresa v pripade staticke konfigurace
     uint32_t netmask; // sitova maska v pripade staticke konfigurace
     uint32_t gateway; // sitova brana v pripade staticke konfigurace
@@ -57,30 +55,41 @@ typedef struct
 } wificonfigarea_t;
 
 // Parametr, predany uzivatelske callback funkci, urceny pro aplikacni vizualizaci stavu konfigurace a pripojeni
-typedef enum
+typedef enum {
-{
     WCS_CONNECTSTART = 0, // zacatek pokusu o pripojeni k ulozene konfiguraci
     WCS_CONNECTING = 1, // probiha pokus o pripojeni
-	WCS_CONNECTED = 2, // pripojeni bylo uspesne
+    WCS_CONNECTED = 2, // pripojeni bylo uspesne/byl spusteny AP
     WCS_CONFIGSTART = 3, // zacatek startu konfiguracniho AP
     WCS_CONFIGWAIT = 4, // cekame na nastaveni konfigurace pres web
     WCS_CONFIGTIMEOUT = 5, // doslo k vyprseni timeoutu konfigurace, budeme se vracet s False jako vysledek z .begin(...)
 } wificonfigstate_t;
 
 // Navratovy parametr z volani begin() - udava, jak se podarilo WiFiConfig modulu pripojit k AP
-typedef enum
+typedef enum {
-{
     WCR_OK = 0, // wifi pripojena/AP nastartovane (dle parametru v EEPROM)
     WCR_TIMEOUT = 1, // wifi neni pripojena a vyprsel zadany timeout
     WCR_CONFIGAP_NOT_STARTED = 2, // wifi neni pripojena a spusteni konfiguracniho AP bylo zakazane parametrem timeout (WC_DONT_RUN_CONFIGAP)
 } wificonfigresult_t;
 
+// Interni reprezentace konfigurace WiFi
+enum {
+    WIFIMODE_AP = WIFI_AP, // rezim prace jako pristupovy bod (AP)
+    WIFIMODE_STA = WIFI_STA, // rezim prace jako klient
+    WIFIMODE_AP_STA = WIFI_AP_STA // rezim prace jako klient i pristupovy bod
+};
+
+// Interni reprezentace konfigurace ip
+enum {
+    IPCONFIG_DHCP = 0x55, // DHCP konfigurace ip adres (default)
+    IPCONFIG_STATIC = 0xaa // staticka konfigurace ip adres
+};
+
 typedef void (*wificonfig_cb)(wificonfigstate_t state); // definice callbacku
 
 typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzivatelskeho parametru
 
 #ifndef WIFI_STA_CONNECT_TIMEOUT
- #define WIFI_STA_CONNECT_TIMEOUT 15000UL // delka cekani na pripojeni k AP [ms]
+# define WIFI_STA_CONNECT_TIMEOUT 20000UL // delka cekani na pripojeni k AP [ms]
 #endif
 
 #ifndef SETUP_SSID
@@ -143,8 +152,6 @@ uint32_t getEEPROMuint32(int start);
  */
 void setEEPROMuint32(int start, uint32_t val);
 
-extern char WiFiDeviceName[]; // jmeno zarizeni, pouzivane i pro DHCP
-
 class WiFiConfigUsrParameter
 {
 public:
@@ -176,7 +183,10 @@ public:
     wificonfigresult_t begin(int configarea, int forceConfigure, wificonfig_cb cb);
     wificonfigresult_t begin(int configarea, int forceConfigure, int timeout, wificonfig_cb cb);
     void addParameter(WiFiConfigUsrParameter *p);
+    void initConfig(int cfgBase, const String &ssid, const String &pass, const int mode = WIFIMODE_STA, const int ipcfg = IPCONFIG_DHCP, const IPAddress &ip = 0, const IPAddress &mask = 0, const IPAddress &gw = 0, const IPAddress &dns = 0);
+
 private:
+    void _prepareWifi(void);
     wificonfigresult_t _setupAP(wificonfig_cb cb);
     void _handleDisplayAP(void);
     void _handleSetAP(void);
@@ -194,4 +204,5 @@ private:
     uint32_t _time; // hodnota, po ktere bude ESP restartovano (pokud je _timeout != 0)
     uint8_t _status; // stav pripojeni - je pouzity pro signalizaci duvodu, proc se nepripoji k AP
 };
+
 #endif

src/embHTML.h

@@ -1,10 +1,18 @@
 // HTML data
+#ifndef WIFICONFIG_WEBTITLE
+#  define WIFICONFIG_WEBTITLE "xPablo.cz Setup"
+#endif
+
+#ifndef WIFICONFIG_TITLE
+# define WIFICONFIG_TITLE "ESP WiFiConfig"
+#endif
+
 static const char TEXTHTML[] PROGMEM = "text/html";
 static const char TEXTPLAIN[] PROGMEM = "text/plain";
 
 static const char PAGE_INDEX1[] PROGMEM = R"=====(
 <!DOCTYPE html><html lang="en"><head><meta charset= "utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-<title>xPablo.cz Setup</title>
+<title>)=====" WIFICONFIG_WEBTITLE R"=====(</title>
 <style>
 .c{text-align: center;}
 div,input{padding:5px;font-size:1em;}
@@ -21,7 +29,7 @@ function c(l){document.getElementById('_s').value=l.innerText||l.textContent;doc
 function hAP(){if (document.getElementById('_a').checked){document.getElementById('apconfig').style.display = 'block';}else{document.getElementById('apconfig').style.display = 'none';}}
 function hSC(){if (document.getElementById('_st').checked){document.getElementById('staticip').style.display = 'block';}else{document.getElementById('staticip').style.display = 'none';}}
 </script>
-</head><body><h1>ESP8266 WiFiConfig</h1><div style='text-align:left;display:inline-block;min-width:260px;'>
+</head><body><h1>)=====" WIFICONFIG_TITLE R"=====(</h1><div style='text-align:left;display:inline-block;min-width:260px;'>
 )=====";
 
 /* Polozky nalezenych SSID
@@ -37,7 +45,6 @@ static const char SSID_ITEM[] PROGMEM = R"=====(
 /* Zacatek formulare pro vyplneni
 {s} - SSID
 {p} - password
-{n} - Netbios name
 {a} - AP mode (checkbox)
 {ch}- cislo kanalu AP
 {c} - staticka IP konfigurace (checkbox)
@@ -48,9 +55,8 @@ static const char SSID_ITEM[] PROGMEM = R"=====(
 */
 static const char PAGE_INDEX2[] PROGMEM = R"=====(
 <form method='post' action='s'>
-<label>SSID<br><input id='_s' name='_s' maxlength=32 required {s}></label><br>
+<label>SSID<br><input id='_s' name='_s' maxlength=32 required placeholder='SSID' {s}></label><br>
-<label>Heslo<br><input id='_p' name='_p' maxlength=64 {p} type='password'></label><br>
+<label>Heslo<br><input id='_p' name='_p' maxlength=64 {p} type='password' placeholder='heslo'></label><br>
-<label>Jméno zařízení<br><input name='_n' maxlength=32 pattern='^[a-zA-Z][a-zA-Z0-9-_\\.]{1,32}$' title='Jméno dle NetBios konvence (max. 16 znaků písmena, čísla a znaky "_.")' {n}></label><br>
 <div>
 <label><input id='_a' name='_a' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hAP();' {a}>Režim AP</label>
 <div id="apconfig">
@@ -58,12 +64,12 @@ static const char PAGE_INDEX2[] PROGMEM = R"=====(
 </div>
 </div>
 <div>
-<label><input id='_st' name='_st' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hSC();' {c}>Staticka IP konfigurace</label>
+<label><input id='_st' name='_st' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hSC();' {c}>Statická IP konfigurace</label>
 <div id="staticip">
-<label>IP adresa<br><input type="text" name="_i" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{i}'></label><br>
+<label>IP adresa<br><input type="text" name="_i" value='{i}'></label><br>
-<label>Síťová maska<br><input type="text" name="_m" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{m}'></label><br>
+<label>Síťová maska<br><input type="text" name="_m" value='{m}'></label><br>
-<label>Síťová brána<br><input type="text" name="_g" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{g}'></label><br>
+<label>Síťová brána<br><input type="text" name="_g" value='{g}'></label><br>
-<label>Server DNS<br><input type="text" name="_d" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{d}'></label><br>
+<label>Server DNS<br><input type="text" name="_d" value='{d}'></label><br>
 </div>
 </div>
 <script>hAP();hSC();</script>
@@ -83,9 +89,22 @@ static const char PAGE_PARAM[] PROGMEM = R"=====(
 static const char PAGE_END[] PROGMEM = R"=====(
 <br>
 <button type='submit'>Uložit a restartovat</button></form>
-</div></body></html>
+</div>)====="
+#if defined APP_NAME && defined APP_VERSION
+R"=====(<div style='text-align:right;font-size:11px;'><hr/>)====="
+APP_NAME
+" v"
+APP_VERSION
+R"=====(</div>
+)====="
+#else
+R"=====(<div style='text-align:right;font-size:11px;'><hr/><a href='http://xpablo.cz' target='_blank' style='color:#aaa;'>WiFiConfig by xPablo</a></div>)====="
+#endif
+R"=====(</body></html>
 )=====";
-
+/*
+<div style='text-align:right;font-size:11px;'><hr/><a href='http://xpablo.cz' target='_blank' style='color:#aaa;'>WiFiConfig by xPablo</a></div>
+ */
 // Nenalezeno zadne SSID
 static const char PAGE_NO_SSID[] PROGMEM = R"=====(
 <div>Nenalezená žádná síť. Občerstvi stránku pro nové hledání.</div>
@@ -93,13 +112,13 @@ static const char PAGE_NO_SSID[] PROGMEM = R"=====(
 
 // Konfigurace ulozena - restartuji...
 static const char PAGE_SAVED[] PROGMEM = R"=====(
-<!DOCTYPE html><html lang="cs"><head><meta http-equiv="refresh" content="10;url=/"/>
+<!DOCTYPE html><html lang="cs"><head><meta http-equiv="refresh" content="5;url=/"/>
 <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1"/>
 <title>xPablo Setup - Konfigurace uložena</title>
 <style>div,input {margin-bottom: 5px;}body{width:200px;display:block;margin-left:auto;margin-right:auto;}</style>
 </head><body>
 Uloženo do EEPROM...<br/>
-Restart za 10 sekund.
+Restart za 5 sekund.
 </body></html>
 )=====";
 
@@ -108,16 +127,101 @@ static const char PAGE_CAPTIVEPORTALCATCH[] PROGMEM = R"=====(
 <style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;}
 .vl-info {border-left: thick solid #1fa3ec;background: #cee6ff; text-align:left; display:inline-block; min-width:260px; margin-top:15px}
 .red { background-color: #ff0000;}
+.magenta { background-color: #ff00ff;}
 </style>
 </head><body><div style='text-align:left;display:inline-block;min-width:260px;'>
-<form action="/config" method="get"><button>Konfigurace WiFi</button></form><br/><form action="/i" method="get"><button>Informace o modulu</button></form><br/><form action="/r" method="post"><button class="red">Reset</button></form><br>
+<form action="/config" method="get">
-)=====";
+<button>Konfigurace WiFi</button>
+</form><br/>
+<form action="/i" method="get">
+<button>Informace o modulu</button>
+</form><br/><form action="/r" method="post">
+<button class="red">Reset</button></form><br>)====="
+#if defined USE_WIFICONFIG_OTAUPDATE
+R"=====(
+</form><br/><form action="/u" method="get">
+<button class="magenta">Aktualizace firmware</button></form><br>)====="
+#endif
+;
 
-// druha cast (mezi 1. a druhou cast muzeme doplnit dodatecne informace)
+// druha cast (mezi 1. a 2. cast muzeme doplnit dodatecne informace)
 static const char PAGE_CAPTIVEPORTALCATCH2[] PROGMEM = R"=====(
-</div></body></html>
+</div>
+)====="
+#if defined APP_NAME && defined APP_VERSION
+R"=====(<div style='text-align:right;font-size:11px;'><hr/>)====="
+APP_NAME
+" v"
+APP_VERSION
+R"=====(</div>
+)====="
+#else
+R"=====(<div style='text-align:right;font-size:11px;'><hr/><a href='http://xpablo.cz' target='_blank' style='color:#aaa;'>WiFiConfig by xPablo</a></div>)====="
+#endif
+R"=====(</body></html>
 )=====";
 
 static const char PAGE_RESTART[] PROGMEM = R"=====(
+<!DOCTYPE html><html lang="cs"><head><meta http-equiv="refresh" content="5;url=/"/>
+<meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1"/>
+<title>xPablo Setup - Restart</title>
+<style>div,input {margin-bottom: 5px;}body{width:200px;display:block;margin-left:auto;margin-right:auto;}</style>
+</head><body>
 Restartuji...
+</body></html>
+)=====";
+
+static const char PAGE_UPDATE[] PROGMEM = R"=====(
+<html lang='en'>
+  <head>
+    <meta charset='utf-8'>
+    <meta name='viewport' content='width=device-width,initial-scale=1'/>
+  </head>
+  <body>
+<form method="POST" action="#" enctype="multipart/form-data" id="upload_form">
+  <input type="file" name="update" accept='.bin' id="file">
+  <input type="submit" value="Update"> </form>
+<div id="prg_wrap" style="border: 0px solid; width: 100%;">
+  <div id="prg" style="text-shadow: 2px 2px 3px black; padding: 5px 0; display: none; border: 1px solid #008aff; background: #002180; text-align: center; color: white;"></div>
+</div>
+<script>
+var domReady = function(callback) {
+  document.readyState === "interactive" || document.readyState === "complete" ? callback() : document.addEventListener("DOMContentLoaded", callback);
+};
+domReady(function() {
+  var myform = document.getElementById('upload_form');
+  var filez = document.getElementById('file');
+  myform.onsubmit = function(event) {
+    event.preventDefault();
+    var formData = new FormData();
+    var file = filez.files[0];
+    if(!file) {
+      return false;
+    }
+    formData.append("files", file, file.name);
+    var xhr = new XMLHttpRequest();
+    xhr.upload.addEventListener("progress", function(evt) {
+      if(evt.lengthComputable) {
+        var per = Math.round((evt.loaded / evt.total) * 100);
+        var prg = document.getElementById('prg');
+        prg.innerHTML = per + "%"
+        prg.style.width = per + "%"
+        prg.style.display = "block"
+      }
+    }, false);
+    xhr.open('POST', location.href, true);
+    // Set up a handler for when the request finishes.
+    xhr.onload = function() {
+      if(xhr.status === 200) {
+        //alert('Success');
+      } else {
+        //alert('An error occurred!');
+      }
+    };
+    xhr.send(formData);
+  }
+});
+</script>
+</body>
+</html>
 )=====";