Odstraneni HTML5 validatoru

README.md

@@ -1,3 +1,5 @@
 # WiFiConfig
 
-Knihovna pro konfiguraci WiFi rozhraní modulu ESP8266
+![Screenshot](doc/images/Screenshot_20180507-100906.png)
+
+Knihovna pro konfiguraci WiFi rozhraní modulu ESP8266 a ESP32, obsahující Captive portal.

WiFiConfig.cpp

@@ -1,782 +0,0 @@
-/*
- * V5.4 - 9.1.2018 - na titulni stranku pridan duvod, proc je spusteny konfiguracni AP. Usnadni to diagnostiku pripadu, kdy se ESP nechce pripojit k AP.
- *
- * 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).
- * 					  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.
- *
- * V5.0 - 29.10.2016- Vyuziti vlastnosti ESP, ktere si uklada wifi konfiguraci do sve vlastni flash oblasti, takze nemusim vse konfigurovat znovu po startu - doufam, ze se tim zrychli asociace s AP
- * 					  kvuli bateriove napajenym pristrojum.
- *
- * V4.7 - 30.8.2016 - Metody .begin se nyni vraci s wificonfigresult_t (podarilo se pripojit k AP, nepodarilo se pripojit a vyprsel timeout pro konfiguracni AP, nepodarilo se pripojit, ale je zakazane spousteni konfiguracniho AP).
- *					  ESP NYNI NENI RESETOVAN PO VYPRSENI TIMEOUTU!!!! Je to kvuli bateriovym cidlum a DeepSleep rezimu v situaci, kdy zmizi AP, ke kteremu se bezne pripojujeme
- *					  Odstraneno odesilani reakce na generate_204 (viz. https://github.com/tzapu/WiFiManager/issues/114)
- *					  Zbytek MAC adresy v pripadnem SSID je nyni vzdy velkymi pismeny (UAA Unique Address Assignment)
- *					  Kvalita signalu jednotlivych AP je nyni uvadena v % namisto uzivatelum nic nerikajicich -dBm
- *					  Pokud do polozky timeout v .begin() metode zadame hodnotu WC_DONT_RUN_CONFIGAP, tak i po neuspesnem pokusu o pripojeni do site NENI spusteny konfiguracni AP (bateriove pristroje, stale bezici pristroje)
- *
- * V4.6 - 26.7.2016 - Moznost nastavit cislo kanalu pro rezim AP, nove eye-candy rozhrani.
- *
- * V4.5 - 20.7.2016 - Moznost konfigurovat cislo kanalu pro nastavovaci AP (default je 3), po nacteni konfiguracni stranky je nastaveny timeout na 6 minut, pokud je ve jmenu SSID pro konfiguracni
- *					  AP znak ? (otaznik), tak je tento nahrazen HEXASCII reprezentaci 3 poslednich bytu MAC adresy AP (POZOR!!! je jina, nez STA!!!)
- *
- * V4.4 - 10.7.2016 - Zmena nazvu vsech privatnich metod (doplnene uvodni podtrzitko _). Pokud tam nebylo, tak napriklad nesel prelozit skript s handleNotFound pokud nebyl dopredne deklarovany (asi zmatek v Arduino preprocesoru)
- *
- * V4.3 - 23.6.2016 - Kazde nacteni webove stranky prodluzuje pripadny timeout pro restart zarizeni.
- *
- * V4.2 - 10.6.2016 - DNSServer a WebServer ukazatele jsou nyni staticke primo v modulu WiFiConfig. Predchozi verze neumoznila soucasne pouziti s knihovnami ESPAsyncWebServer z duvodu kolize nekterych definic HTTP metod
- *
- * V4.1 - 18.5.2016 - Nenechame SDK ukladat WiFi konfiguraci do Flash (setrime prepisy)
- *
- * V4.0 - 10.4.2016 - pridana moznost staticke konfigurace ip parametru. POZOR!!!! ukladani dat do EEPROM (verejne funkce) nyni nevolaji automaticky commit() kvuli snizeni poctu prepisu Flash EEPROM
- * 					  pridana moznost timeoutu pro konfiguracni AP. Pokud timeout vyprsi, tak se zarizeni automaticky restartuje, coz vyvola novy pokus o pripojeni.
- *
- * V3.0 - 27.2.2016 - pridana presmerovavaci stranka kvuli Captive portalu, doplneno servirovani favicon.ico, doplnena moznost zadavani uzivatelskych parametru, www server a DNS server jsou dynamicky vytvareny
- *
- * V2.4 - 7.2.2016  - upraveno casovani pri pripojovani k AP (zmizel delay(100))
- *
- * V2.3 - 5.2.2016  - pridano zverejneni jmena hosta a nastaveni tohoto jmena pro DHCP apod.
- *
- * V2.2 - 19.1.2016 - pridan Captive portal pri konfiguracnim AP.
- *
- * V2.1 - 20.9.2015 - pridano zadavani jmena zarizeni. Modul ho sice nevyuziva, ale aplikace ano a v pripade DHCP se dost hodi.
- *
- * V2.0 - 30.8.2015 - Podstatnym zpusobem vylepsena signalizace vnitrniho stavu, presunuto ulozeni rezimu (commit je uz zbytecny - udela se pri ukladani retezcu - uspora kodu/setreni prepisu pameti Flash)
- *
- * V1.2 - 23.8.2015 - BugFix - pridan chybejici eeprom.commit() po ulozeni rezimu prace
- *
- * V1.1 - 5.8.2015 - pridana moznost volani callback metody pri behu konfiguracniho AP (signalizace stavu uzivatelskym zpusobem)
- *
- * V1.0 - publikace na www.xpablo.cz
- *
- * TODO:
- * Prejit na pripojovani pomoci vnitrnich mechanizmu SDK ESP - zvysi se tim rychlost pripojeni kvuli bateriovym zarizenim
- */
-
-#include "WiFiConfig.h"
-#include <ESP8266WebServer.h>
-#include <DNSServer.h>
-#include <EEPROM.h>
-#include <Ticker.h>
-#include "embHTML.h"
-
-#ifdef DEBUG_ESP_PORT
- #define DEBUG_MSG(_1, ...) DEBUG_ESP_PORT.printf_P(PSTR(_1), ##__VA_ARGS__)
-#else
- #define DEBUG_MSG(...)
-#endif
-
-extern "C" {
-  #include "user_interface.h"
-}
-
-#define DNS_PORT 53
-
-char WiFiDeviceName[elementSize(wificonfigarea_t, devname)]; // misto pro jmeno zarizeni (dodane do DNS, DHCP NBNS apod...)
-
-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
-
-static std::unique_ptr<DNSServer>        dnsServer;
-static std::unique_ptr<ESP8266WebServer> server;
-static std::unique_ptr<Ticker> rsttick;
-
-const char VALUE[] PROGMEM = "value='";
-const char CHECKED[] PROGMEM = "checked='checked'";
-
-IPAddress getOurIP(void)
-{
-	IPAddress ipa;
-	WiFiMode_t wm = WiFi.getMode();
-
-	switch (wm)
-	{
-	case WIFI_STA:
-	  ipa = WiFi.localIP();
-	break;
-
-	case WIFI_AP:
-	  ipa = WiFi.softAPIP();
-	break;
-
-	default:
-	  ipa = IPAddress(0,0,0,0); // nelze urcit ip adresu (bud je AP + STA aktivni, nebo je vypnute WiFi)
-	break;
-	}
-	return ipa;
-}
-
-uint8_t * getOurMAC(uint8_t *mac)
-{
-
-	if (WIFIMODE_STA == EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
-		return WiFi.macAddress(mac);
-	else
-		return WiFi.softAPmacAddress(mac);
-}
-
-uint32_t getEEPROMuint32(int start)
-{
-	uint32_t result = 0;
-
-	for (int i=0; i<4; ++i)
-	{
-		result <<= 8;
-		result += EEPROM.read(start);
-		++start;
-	}
-	return result;
-}
-
-void setEEPROMuint32(int start, uint32_t val)
-{
-
-	for (int i=0; i<4; ++i)
-	{
-		EEPROM.write(start + 3 - i, (uint8_t)val);
-		val >>= 8;
-	}
-}
-
-String getEEPROMString(int start, int len)
-{
-  String string = "";
-
-  for (int i = start; i < + start + len; ++i)
-  {
-    uint8_t b = EEPROM.read(i);
-
-    if ((0xff == b) || (0 == b))
-      break;
-    string.concat(char(b));
-  }
-  return string;
-}
-
-void setEEPROMString(int start, int len, String string)
-{
-  unsigned int si = 0;
-
-  for (int i = start; i < start + len; ++i)
-  {
-    char c;
-
-    if (si < string.length())
-    {
-      c = string[si];
-    }
-    else
-    {
-      c = 0;
-    }
-    EEPROM.write(i, c);
-    ++si;
-  }
-}
-
-WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, int length, storeparam_cb cb)
-{
-  _next = NULL;
-  _cb = cb;
-  _id = id;
-  _label = label;
-  _length = length;
-  _value = new char[length + 1];
-  for (int i = 0; i < length; i++)
-  {
-    _value[i] = 0;
-  }
-  if (defaultValue != NULL)
-  {
-    strncpy(_value, defaultValue, length);
-  }
-}
-
-const char* WiFiConfigUsrParameter::getValue()
-{
-
-  return _value;
-}
-
-const char* WiFiConfigUsrParameter::getID()
-{
-
-  return _id;
-}
-
-const char* WiFiConfigUsrParameter::getLabel()
-{
-
-  return _label;
-}
-
-int WiFiConfigUsrParameter::getValueLength()
-{
-
-  return _length;
-}
-
-void WiFiConfigUsrParameter::setNext(WiFiConfigUsrParameter *n)
-{
-
-  _next = n;
-}
-
-WiFiConfigUsrParameter *WiFiConfigUsrParameter::getNext()
-{
-
-  return _next;
-}
-
-void WiFiConfigUsrParameter::setNewValue(const char *newval)
-{
-
-	if (0 != strcmp(_value, newval))
-		_cb(newval);
-}
-
-WiFiConfigUsrParameter *WiFiConfig::_searchUsrParameter(const char *name)
-{
-  WiFiConfigUsrParameter *ptr = _params;
-
-  while (NULL != ptr)
-  {
-  	if (0 == strcmp(name, ptr->getID()))
-  		break;
-  	ptr = ptr->getNext();
-  }
-  return ptr;
-}
-
-void WiFiConfig::addParameter(WiFiConfigUsrParameter *p)
-{
-	p->setNext(_params);
-	_params = p;
-}
-
-void WiFiConfig::_handleNotFound(void)
-{
-
-//	_time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat
-	DEBUG_MSG("Requested URI: %s\r\n", server->uri().c_str());
-
-	if (server->uri().endsWith(String(F("favicon.ico"))))
-	{
-   		server->send(404, F("text/plain"), F("Err"));
-	}
-  else
-	{
-    	server->sendHeader(F("Location"), String(F("http://")) + server->client().localIP().toString() + String(F("/index.htm")), true);
-//      server->sendHeader(F("Location"), String(F("http://")) + WiFi.softAPIP().toString() + String(F("/index.htm")), true);
-    	server->send (302, F("text/plain"), F("Redirect"));
-	}
-}
-
-void WiFiConfig::_handleReset(void)
-{
-
-  rsttick.reset(new(Ticker));
-
-  rsttick->once_ms(700, []()
-  {
-    ESP.restart();
-  });
-
-  server->send_P(200, TEXTHTML, PAGE_RESTART);
-}
-
-void WiFiConfig::_handleInfo(void)
-{
-  String reply;
-
-  reply.reserve(3000);
-
-  reply = FPSTR(PAGE_INDEX1);
-  reply.concat(F("<form><table><TR><TH>System Info<TH>"));
-
-  reply.concat(F("<TR><TD>Core Version:<TD>"));
-  reply.concat(ESP.getCoreVersion());
-
-  reply.concat(F("<TR><TD>Flash Size:<TD>"));
-  reply.concat(ESP.getFlashChipRealSize() / 1024);
-  reply.concat(F(" kB"));
-
-  reply.concat(F("<TR><TD>Sketch Size/Free:<TD>"));
-  reply.concat(ESP.getSketchSize() / 1024);
-  reply.concat(F(" kB / "));
-  reply.concat(ESP.getFreeSketchSpace() / 1024);
-  reply.concat(F(" kB"));
-
-  reply.concat(F("<TR><TD>STA MAC:<TD>"));
-  uint8_t mac[] = {0, 0, 0, 0, 0, 0};
-  uint8_t* macread = WiFi.macAddress(mac);
-  char macaddress[20];
-  sprintf_P(macaddress, PSTR("%02x:%02x:%02x:%02x:%02x:%02x"), macread[0], macread[1], macread[2], macread[3], macread[4], macread[5]);
-  reply.concat(macaddress);
-
-  reply.concat(F("<TR><TD>AP MAC:<TD>"));
-  macread = WiFi.softAPmacAddress(mac);
-  sprintf_P(macaddress, PSTR("%02x:%02x:%02x:%02x:%02x:%02x"), macread[0], macread[1], macread[2], macread[3], macread[4], macread[5]);
-  reply.concat(macaddress);
-
-  reply.concat(F("<TR><TD>ESP Chip ID:<TD>"));
-  reply.concat(ESP.getChipId());
-
-  reply.concat(F("<TR><TD>Flash Chip ID:<TD>"));
-  reply.concat(ESP.getFlashChipId());
-
-  reply.concat(F("</table></form>"));
-  server->send(200, TEXTHTML, reply);
-}
-
-void WiFiConfig::_handleRoot(void)
-{
-  String content;
-
-  content.reserve(3000);
-  content = FPSTR(PAGE_CAPTIVEPORTALCATCH); // 1. cast stranky
-// pridame informaci o stavu pokusu o pripojeni
-  content.concat(F("<div class=\"vl-info\">Pokus o připojení: "));
-  switch (_status)
-  {
-  case STATION_IDLE:
-    content.concat(F("Klid"));
-  break;
-
-  case STATION_CONNECTING:
-    content.concat(F("Připojování"));
-  break;
-
-  case STATION_WRONG_PASSWORD:
-    content.concat(F("Špatné heslo"));
-  break;
-
-  case STATION_NO_AP_FOUND:
-    content.concat(F("AP nenalezen"));
-  break;
-
-  case STATION_CONNECT_FAIL:
-    content.concat(F("Připojení selhalo"));
-  break;
-
-  case STATION_GOT_IP:
-    content.concat(F("Získaná ip"));
-  break;
-
-  case 0xfe:
-    content.concat(F("Špatná EEPROM"));
-  break;
-
-  case 0xff:
-    content.concat(F("Vynucená konfigurace"));
-  break;
-
-  default:
-    content.concat(F("Neznámého"));
-  break;
-  }
-  content.concat(F("</div>"));
-  content.concat(FPSTR(PAGE_CAPTIVEPORTALCATCH2)); // 2. cast stranky (ukonceni)
-  server->send(200, TEXTHTML, content);
-	_time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat
-}
-
-void WiFiConfig::_handleDisplayAP(void)
-{
-	String s;
-	String v;
-	String content;
-
-	_time = millis() + (360 * 1000); // spocitame si novy cas, kdy budeme modul restartovat (6 minut)
-  content.reserve(3000);
-	content = FPSTR(PAGE_INDEX1);
-	int n = WiFi.scanNetworks();
-	if (0 == n)
-	{
-		content.concat(FPSTR(PAGE_NO_SSID));
-	}
-	else
-	{
-		for (int i = 0; i < n; ++i)
-		{
-		  int quality;
-
-  		if (WiFi.RSSI(i) <= -100)
-    		quality = 0;
-  		else if (WiFi.RSSI(i) >= -50)
-    		quality = 100;
-  		else
-    		quality = 2 * (WiFi.RSSI(i) + 100);
-
-			s = FPSTR(SSID_ITEM);
-			s.replace(F("{v}"), WiFi.SSID(i));
-			s.replace(F("{a}"), String(quality));
-			s.replace(F("{s}"), (ENC_TYPE_NONE == WiFi.encryptionType(i)) ? F("") : F("l"));
-			content.concat(s);
-		}
-	}
-	s = FPSTR(PAGE_INDEX2);
-	v = getEEPROMString(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'"));
-	v = getEEPROMString(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'"));
-	v = getEEPROMString(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
-		s.replace(F("{a}"), F(""));
-	if (EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)) == IPCONFIG_STATIC)
-		s.replace(F("{c}"), FPSTR(CHECKED));
-	else
-		s.replace(F("{c}"), F(""));
-	s.replace(F("{i}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))).toString());
-	s.replace(F("{m}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))).toString());
-	s.replace(F("{g}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))).toString());
-	s.replace(F("{d}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))).toString());
-
-	uint8_t chan = EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel));
-	if ((chan < 1) || (chan > 13))
-		chan = 1; // neplatne cislo kanalu nahradime nejnizsim
-	s.replace(F("{ch}"), String(chan));
-
-	content.concat(s);
-
-// Uzivatelske parametry
-	if (_params)
-	{
-		content.concat(FPSTR(PAGE_PARAM_HDR));
-	}
-
-	WiFiConfigUsrParameter *up = _params;
-
-	while (NULL != up)
-	{
-		s = FPSTR(PAGE_PARAM);
-		s.replace(F("{t}"), up->getLabel());
-		s.replace(F("{n}"), up->getID());
-		s.replace(F("{l}"), String(up->getValueLength()));
-		s.replace(F("{v}"), up->getValue());
-		content.concat(s);
-		up = up->getNext();
-	}
-
-	content.concat(FPSTR(PAGE_END));
-	server->send(200, TEXTHTML, content);
-}
-
-// Deal with (potentially) plus-encoded ssid/pass
-void WiFiConfig::_plusDecode(String &s)
-{
-
-	for (unsigned int i = 0; i < s.length(); i++)
-		s[i] = (s[i] == '+' ? ' ' : s[i]);
-}
-
-void WiFiConfig::_handleSetAP(void)
-{
-	uint8_t mode;
-	String str;
-
-	str.reserve(128);
-	str = server->arg(F("_s"));
-	if (str.length() > 0)
-	{
-		_plusDecode(str);
-		setEEPROMString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str);
-
-		str = server->arg(F("_p"));
-		_plusDecode(str);
-		setEEPROMString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str);
-
-		str = server->arg(F("_n"));
-		setEEPROMString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname), str);
-
-		str = server->arg(F("_a"));
-		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
-			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
-		{ // staticka ip konfigurace
-			IPAddress ipa;
-
-			EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_STATIC);
-			str = server->arg(F("_i"));
-			ipa.fromString(str);
-			setEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr), (uint32_t) ipa);
-
-			str = server->arg(F("_m"));
-			ipa.fromString(str);
-			setEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask), (uint32_t) ipa);
-
-			str = server->arg(F("_g"));
-			ipa.fromString(str);
-			setEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway), (uint32_t) ipa);
-
-			str = server->arg(F("_d"));
-			ipa.fromString(str);
-			setEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns), (uint32_t) ipa);
-		}
-
-// Uzivatelske parametry
-		for (int i = 0; i < server->args(); i++)
-		{
-			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());
-			}
-		}
-		EEPROM.commit(); // skutecne ulozime data
-	}
-	server->send(200, F("text/html"), FPSTR(PAGE_SAVED));
-	delay(2000); // cekame na odeslani dat
-// nakonfigurujeme ESP dle nove nastavenych parametru
-	WiFi.disconnect(); // vsechno odpojime
-	WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci
-
-	String s = getEEPROMString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
-	strcpy(WiFiDeviceName, s.c_str());
-	s = getEEPROMString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid));
-	String pass =  getEEPROMString(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");
-			WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
-      if (strlen(WiFiDeviceName))
-        WiFi.hostname(WiFiDeviceName); // nastavime jmeno zarizeni
-			WiFi.begin(s.c_str(), pass.c_str());
-			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))));
-			}
-			wifi_station_set_auto_connect(true);
-		}
-		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();
-}
-
-// Start WiFi v rezimu AP pro nastaveni modulu
-wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
-{
-	String ssid = SETUP_SSID;
-
-	WiFi.persistent(false); // chranime flash pred zbytecnymi prepisy
-	dnsServer.reset(new DNSServer());
-	server.reset(new ESP8266WebServer(80));
-
-	/* Soft AP network parameters */
-	IPAddress apIP(192, 168, 4, 1);
-	IPAddress netMsk(255, 255, 255, 0);
-
-	WiFi.disconnect(); // pro jistotu se odpojime
-	WiFi.mode(WIFI_AP);
-
-	WiFi.softAPConfig(apIP, apIP, netMsk);
-	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);
-	delay(500); // dulezite - jinak se nevraci spravna IP adresa !!! (udajne od verze 2.3.0 uz neni nutne)
-
-	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)
-		cb(WCS_CONFIGSTART); // signalizujeme start konfiguracniho serveru
-// Nastavime handlery weboveho serveru pro konfiguraci
-	server->onNotFound(std::bind(&WiFiConfig::_handleNotFound, this));
-	server->on(F("/config"), std::bind(&WiFiConfig::_handleDisplayAP, this));
-  server->on(F("/s"), std::bind(&WiFiConfig::_handleSetAP, this));
-  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));
-	server->begin(); // startujeme webovy server
-	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 (millis() > _time)
-			{
-				DEBUG_MSG("AP timeout\r\n");
-				if (cb)
-					cb(WCS_CONFIGTIMEOUT); // signalizujeme timeout
-				break; // ukoncime cekani a vracime se
-			}
-		}
-	}
-// tady by asi melo byt zastaveni weboveho a dns serveru...
-  dnsServer->stop();
-  server->stop();
-	return WCR_TIMEOUT; // nepripojeno, vyprsel timeout konfiguracniho AP
-}
-
-// Testovani, zda se modul pripojil k AP
-bool WiFiConfig::_testWifi(wificonfig_cb cb)
-{
-	uint32_t startt = millis();
-
-  DEBUG_MSG("Trying to connect.\r\n");
-	while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT)
-	{
-		if (WL_CONNECTED == WiFi.status())
-		{
-  			DEBUG_MSG("Connected...\r\n");
-  			if (cb)
-  				cb(WCS_CONNECTED);
-			return true; // jsme pripojeni
-		}
-		yield();
-		if (cb)
-			cb(WCS_CONNECTING); // signalizujeme pokracujici pokus o spojeni
-	}
-  	DEBUG_MSG("Not connected!\r\n");
-  _status = wifi_station_get_connect_status();
-	return false; // pripojeni se nezdarilo
-}
-
-wificonfigresult_t WiFiConfig::begin(int configarea, uint8_t forceConfigure, wificonfig_cb cb)
-{
-	wificonfigresult_t result = WCR_OK; // predpokladame, ze se pripojeni podari
-
-	DEBUG_MSG("\r\n\r\n"); // oddeleni vypisu
-
-	configBase = configarea; // pocatek konfigurace v EEPROM
-	if (0 == forceConfigure)
-	{
-		DEBUG_MSG("Force config.\r\n");
-    _status = 0xff;
-		result = _setupAP(cb);
-	}
-	else
-	{
-		if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) != WiFi.getMode())
-		{ // neshoduje se rezim - musime spustit konfiguracni AP (poskozena konfigurace)
-			DEBUG_MSG("Wrong config\r\n");
-      _status = 0xfe;
-			result = _setupAP(cb);
-		}
-		else
-		{
-			String s = getEEPROMString(configBase + offsetof(wificonfigarea_t, devname), elementSize(wificonfigarea_t, devname));
-			strcpy(WiFiDeviceName, s.c_str());
-
-			switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
-			{
-			case WIFIMODE_STA:
-			{
-				WiFi.hostname(WiFiDeviceName); // nastavime jmeno zarizeni
-				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
-				{
-					if (cb)
-						cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni
-					if (!_testWifi(cb))
-					{
-						result = _setupAP(cb); // modul se nepripojil - startujeme AP rezim
-					}
-				}
-			}
-			break;
-
-			case WIFIMODE_AP:
-				DEBUG_MSG("AP mode.\r\n");
-				if (cb)
-					cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni (zde se nic jineho stejne nestane...)
-			break;
-			}
-		}
-	}
-	return result; // mame vyreseno
-}
-
-wificonfigresult_t WiFiConfig::begin(int configarea, uint8_t forceConfigure, int timeout, wificonfig_cb cb = NULL)
-{
-	if (forceConfigure)
-	{ // pouze pokud nemame vynucenou konfiguraci merime cas - to nam umozni dostat se ze spatne zadaneho timeoutu, ktery se neda zvladnout
-		if ((timeout > 0) && (40 > timeout))
-			timeout = 40; // timeout musi byt minimalne 40 sekund
-		_timeout = timeout;
-		if (_timeout > 0)
-			_time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat
-	}
-	else
-		_timeout = 0; // pri vynucene konfiguraci se parametr timeout neuplatni
-	return begin(configarea, forceConfigure, cb); // spustime WiFi
-}
-// EOF

examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino

@@ -2,8 +2,9 @@
 #include <ESP8266WebServer.h>
 #include <ArduinoOTA.h>
 #include <EEPROM.h>
-#include "src/espnbns/espnbns.h"
+#include <ESP8266NetBIOS.h>
-#include "src/WiFiConfig/WiFiConfig.h"
+#include <WiFiConfig.h>
+#include <encipheredEEPROMStrings.h>
 
 // Plati pro desticku Witty s modulem ESP-12E
 #define PIN_FORCE_CONFIG 4
@@ -14,9 +15,21 @@
 //#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
+{
+  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...)
 ESP8266WebServer wwwserver(80); // webovy server
 String content;
-NBNS nbns; // Netbios (xPablo.cz)
 
 static void handleRoot(void)
 {
@@ -53,23 +66,27 @@ void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
   }
 }
 
-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(512); // zahajujeme praci s EEPROM
+  EEPROM.begin(EEPROM_SIZE); // 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);
-  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);
@@ -77,7 +94,7 @@ void ICACHE_FLASH_ATTR setup()
 
   if (strlen(WiFiDeviceName) > 0)
   {
-    nbns.begin(WiFiDeviceName);
+    NBNS.begin(WiFiDeviceName);
     ArduinoOTA.setHostname(WiFiDeviceName);
   }
 
@@ -125,5 +142,4 @@ void loop()
 {
   wwwserver.handleClient(); // osetrujeme praci serveru
   ArduinoOTA.handle();
-  nbns.poll();
 }

library.json

@@ -0,0 +1,22 @@
+{
+  "name":"WiFiConfig",
+  "description":"Web based WiFi part configuration for the ESP8266 and ESP32 SoC",
+  "keywords":"wifi, configuration",
+  "authors":
+  {
+    "name": "Pavel Brychta",
+    "maintainer": true
+  },
+  "repository":
+  {
+    "type": "git",
+    "url": "http://git.xpablo.cz/pablo2048/WiFiConfig.git"
+  },
+  "version": "6.3.1",
+  "license": "MIT",
+  "frameworks": "arduino",
+  "platforms": ["espressif8266", "espressif32"],
+  "build": {
+    "libCompatMode": 2
+  }
+}

library.properties

@@ -1,9 +1,9 @@
 name=WiFiConfig
-version=5.4.0
+version=6.3.1
 author=Pavel Brychta
 maintainer=Pavel Brychta <Pablo@xpablo.cz>
 sentence=Enables seamless module configuration.
-paragraph=With this library you can enable your ESP8266 module to be configured over network. Includes Captive Portal for easy 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
-architectures=esp8266
+architectures=esp8266,esp32

src/WiFiConfig.cpp

@@ -0,0 +1,933 @@
+/*
+ * V6.3.1- 1.9.2019 - Odstraneni HTML5 validatoru - delaly akorat problemy anedala 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
+ *
+ * V5.8 - 5.7.2018 - Opraveno spatne zobrazovani sily signalu v prehledu WiFi siti (spatne barvy)
+ *
+ * V5.7 - 4.7.2018 - BugFix - staticka konfigurace ip adresy se neuplatnila - vypada to, jako kdyby SDK ukladalo SSID a Password, ale uz neuklada
+ *            konfiguraci ip adres, takze je treba je vzdycky nastavit znovu
+ *
+ * V5.6 - 1.7.2018 - BugFix - odstraneno volani _plusDecode, protoze parametry jsou nyni predavany v 'ciste' forme uz z weboveho serveru a tato metoda znehodnotila retezce, ktere obsahovaly ynak '+'
+ *
+ * V5.5 - 3.6.2018 - Flash Chip ID a ESP Chip ID jsou zobrazeny hexadecimalne v prehledove strance
+ *
+ * V5.4 - 9.1.2018 - na titulni stranku pridan duvod, proc je spusteny konfiguracni AP. Usnadni to diagnostiku pripadu, kdy se ESP nechce pripojit k AP.
+ *
+ * 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 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.
+ *
+ * V5.0 - 29.10.2016- Vyuziti vlastnosti ESP, ktere si uklada wifi konfiguraci do sve vlastni flash oblasti, takze nemusim vse konfigurovat znovu po startu - doufam, ze se tim zrychli asociace s AP
+ *            kvuli bateriove napajenym pristrojum.
+ *
+ * V4.7 - 30.8.2016 - Metody .begin se nyni vraci s wificonfigresult_t (podarilo se pripojit k AP, nepodarilo se pripojit a vyprsel timeout pro konfiguracni AP, nepodarilo se pripojit, ale je zakazane spousteni konfiguracniho AP).
+ *            ESP NYNI NENI RESETOVAN PO VYPRSENI TIMEOUTU!!!! Je to kvuli bateriovym cidlum a DeepSleep rezimu v situaci, kdy zmizi AP, ke kteremu se bezne pripojujeme
+ *            Odstraneno odesilani reakce na generate_204 (viz. https://github.com/tzapu/WiFiManager/issues/114)
+ *            Zbytek MAC adresy v pripadnem SSID je nyni vzdy velkymi pismeny (UAA Unique Address Assignment)
+ *            Kvalita signalu jednotlivych AP je nyni uvadena v % namisto uzivatelum nic nerikajicich -dBm
+ *            Pokud do polozky timeout v .begin() metode zadame hodnotu WC_DONT_RUN_CONFIGAP, tak i po neuspesnem pokusu o pripojeni do site NENI spusteny konfiguracni AP (bateriove pristroje, stale bezici pristroje)
+ *
+ * V4.6 - 26.7.2016 - Moznost nastavit cislo kanalu pro rezim AP, nove eye-candy rozhrani.
+ *
+ * V4.5 - 20.7.2016 - Moznost konfigurovat cislo kanalu pro nastavovaci AP (default je 3), po nacteni konfiguracni stranky je nastaveny timeout na 6 minut, pokud je ve jmenu SSID pro konfiguracni
+ *            AP znak ? (otaznik), tak je tento nahrazen HEXASCII reprezentaci 3 poslednich bytu MAC adresy AP (POZOR!!! je jina, nez STA!!!)
+ *
+ * V4.4 - 10.7.2016 - Zmena nazvu vsech privatnich metod (doplnene uvodni podtrzitko _). Pokud tam nebylo, tak napriklad nesel prelozit skript s handleNotFound pokud nebyl dopredne deklarovany (asi zmatek v Arduino preprocesoru)
+ *
+ * V4.3 - 23.6.2016 - Kazde nacteni webove stranky prodluzuje pripadny timeout pro restart zarizeni.
+ *
+ * V4.2 - 10.6.2016 - DNSServer a WebServer ukazatele jsou nyni staticke primo v modulu WiFiConfig. Predchozi verze neumoznila soucasne pouziti s knihovnami ESPAsyncWebServer z duvodu kolize nekterych definic HTTP metod
+ *
+ * V4.1 - 18.5.2016 - Nenechame SDK ukladat WiFi konfiguraci do Flash (setrime prepisy)
+ *
+ * V4.0 - 10.4.2016 - pridana moznost staticke konfigurace ip parametru. POZOR!!!! ukladani dat do EEPROM (verejne funkce) nyni nevolaji automaticky commit() kvuli snizeni poctu prepisu Flash EEPROM
+ *            pridana moznost timeoutu pro konfiguracni AP. Pokud timeout vyprsi, tak se zarizeni automaticky restartuje, coz vyvola novy pokus o pripojeni.
+ *
+ * V3.0 - 27.2.2016 - pridana presmerovavaci stranka kvuli Captive portalu, doplneno servirovani favicon.ico, doplnena moznost zadavani uzivatelskych parametru, www server a DNS server jsou dynamicky vytvareny
+ *
+ * V2.4 - 7.2.2016  - upraveno casovani pri pripojovani k AP (zmizel delay(100))
+ *
+ * V2.3 - 5.2.2016  - pridano zverejneni jmena hosta a nastaveni tohoto jmena pro DHCP apod.
+ *
+ * V2.2 - 19.1.2016 - pridan Captive portal pri konfiguracnim AP.
+ *
+ * V2.1 - 20.9.2015 - pridano zadavani jmena zarizeni. Modul ho sice nevyuziva, ale aplikace ano a v pripade DHCP se dost hodi.
+ *
+ * V2.0 - 30.8.2015 - Podstatnym zpusobem vylepsena signalizace vnitrniho stavu, presunuto ulozeni rezimu (commit je uz zbytecny - udela se pri ukladani retezcu - uspora kodu/setreni prepisu pameti Flash)
+ *
+ * V1.2 - 23.8.2015 - BugFix - pridan chybejici eeprom.commit() po ulozeni rezimu prace
+ *
+ * V1.1 - 5.8.2015 - pridana moznost volani callback metody pri behu konfiguracniho AP (signalizace stavu uzivatelskym zpusobem)
+ *
+ * V1.0 - publikace na www.xpablo.cz
+ *
+ * TODO:
+ * Prejit na pripojovani pomoci vnitrnich mechanizmu SDK ESP - zvysi se tim rychlost pripojeni kvuli bateriovym zarizenim
+ */
+
+#include <DNSServer.h>
+#if defined(ESP8266)
+ #include <ESP8266WebServer.h>
+#else
+ #include <WebServer.h>
+#endif
+#include "WiFiConfig.h"
+#include <EEPROM.h>
+#include <Ticker.h>
+#include <encipheredEEPROMStrings.h>
+#include "embHTML.h"
+
+#ifdef DEBUG_ESP_PORT
+ #define DEBUG_MSG(_1, ...) DEBUG_ESP_PORT.printf_P(PSTR(_1), ##__VA_ARGS__)
+#else
+ #define DEBUG_MSG(...)
+#endif
+
+#if defined(ESP8266)
+ extern "C" {
+ #include "user_interface.h"
+ }
+ #define ESP_getChipId() (ESP.getChipId())
+#else
+ #include <esp_wifi.h>
+ #define ESP_getChipId() ((uint32_t)ESP.getEfuseMac())
+#endif
+
+#define DNS_PORT 53
+
+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
+
+static std::unique_ptr<DNSServer> dnsServer;
+#if defined(ESP8266)
+static std::unique_ptr<ESP8266WebServer> server;
+#else
+static std::unique_ptr<WebServer> server;
+#endif
+static std::unique_ptr<Ticker> rsttick;
+
+const char VALUE[] PROGMEM = "value='";
+const char CHECKED[] PROGMEM = "checked='checked'";
+
+IPAddress getOurIP(void)
+{
+  IPAddress ipa;
+  WiFiMode_t wm = WiFi.getMode();
+
+  switch (wm)
+  {
+  case WIFI_STA:
+    ipa = WiFi.localIP();
+    break;
+
+  case WIFI_AP:
+    ipa = WiFi.softAPIP();
+    break;
+
+  default:
+    ipa = IPAddress(0, 0, 0, 0); // nelze urcit ip adresu (bud je AP + STA aktivni, nebo je vypnute WiFi)
+    break;
+  }
+  return ipa;
+}
+
+uint8_t * getOurMAC(uint8_t *mac)
+{
+
+  if (WIFIMODE_STA == EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
+    return WiFi.macAddress(mac);
+  else
+    return WiFi.softAPmacAddress(mac);
+}
+
+uint32_t getEEPROMuint32(unsigned int start)
+{
+  uint32_t result = 0;
+
+  for (uint32_t i = 0; i < 4; ++i)
+  {
+    result <<= 8;
+    result += EEPROM.read(start);
+    ++start;
+  }
+  return result;
+}
+
+void setEEPROMuint32(unsigned int start, uint32_t val)
+{
+
+  for (unsigned int i = 0; i < 4; ++i)
+  {
+    EEPROM.write(start + 3 - i, (uint8_t)val);
+    val >>= 8;
+  }
+}
+
+String getEEPROMString(unsigned int start, size_t len)
+{
+  String string = "";
+
+  for (unsigned int i = start; i < + start + len; ++i)
+  {
+    uint8_t b = EEPROM.read(i);
+
+    if ((0xff == b) || (0 == b))
+      break;
+    string += char(b);
+  }
+  return string;
+}
+
+void setEEPROMString(unsigned int start, size_t len, String &string)
+{
+  unsigned int si = 0;
+
+  for (unsigned int i = start; i < start + len; ++i)
+  {
+    char c;
+
+    if (si < string.length())
+    {
+      c = string[si];
+    }
+    else
+    {
+      c = 0;
+    }
+    EEPROM.write(i, c);
+    ++si;
+  }
+}
+
+WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, unsigned int length, storeparam_cb cb)
+{
+  _next = NULL;
+  _cb = cb;
+  _id = id;
+  _label = label;
+  _length = length;
+  _value = new char[length + 1];
+  for (unsigned int i = 0; i < length; i++)
+  {
+    _value[i] = 0;
+  }
+  if (defaultValue != NULL)
+  {
+    strncpy(_value, defaultValue, length);
+  }
+}
+
+const char* WiFiConfigUsrParameter::getValue()
+{
+
+  return _value;
+}
+
+const char* WiFiConfigUsrParameter::getID()
+{
+
+  return _id;
+}
+
+const char* WiFiConfigUsrParameter::getLabel()
+{
+
+  return _label;
+}
+
+int WiFiConfigUsrParameter::getValueLength()
+{
+
+  return _length;
+}
+
+void WiFiConfigUsrParameter::setNext(WiFiConfigUsrParameter *n)
+{
+
+  _next = n;
+}
+
+WiFiConfigUsrParameter *WiFiConfigUsrParameter::getNext()
+{
+
+  return _next;
+}
+
+void WiFiConfigUsrParameter::setNewValue(const char *newval)
+{
+
+  if (0 != strcmp(_value, newval))
+    _cb(newval);
+}
+
+WiFiConfigUsrParameter *WiFiConfig::_searchUsrParameter(const char *name)
+{
+  WiFiConfigUsrParameter *ptr = _params;
+
+  while (NULL != ptr)
+  {
+    if (0 == strcmp(name, ptr->getID()))
+      break;
+    ptr = ptr->getNext();
+  }
+  return ptr;
+}
+
+void WiFiConfig::addParameter(WiFiConfigUsrParameter *p)
+{
+  p->setNext(_params);
+  _params = p;
+}
+
+void WiFiConfig::_handleNotFound(void)
+{
+
+  DEBUG_MSG("Requested URI: %s\r\n", server->uri().c_str());
+
+  if (server->uri().endsWith(String(F("favicon.ico"))))
+  {
+    server->send_P(404, TEXTPLAIN, PSTR("Err"));
+  }
+  else
+  {
+    String redirect;
+    redirect.reserve(256);
+    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"));
+  }
+}
+
+void WiFiConfig::_handleReset(void)
+{
+
+  rsttick.reset(new(Ticker));
+
+  rsttick->once_ms(700, []()
+  {
+    ESP.restart();
+  });
+
+  server->send_P(200, TEXTHTML, PAGE_RESTART);
+}
+
+void WiFiConfig::_handleInfo(void)
+{
+  String reply;
+  char buff[32];
+
+  reply.reserve(3000);
+
+  reply = FPSTR(PAGE_INDEX1);
+  reply.concat(F("<form><table><TR><TH>System Info<TH>"));
+
+  reply.concat(F("<TR><TD>Core Version:<TD>"));
+#if defined(ESP8266)
+  reply.concat(ESP.getFullVersion());
+#else
+  // TODO
+  reply.concat(ESP.getSdkVersion());
+#endif
+
+  reply.concat(F("<TR><TD>Flash Size:<TD>"));
+#if defined(ESP8266)
+  reply.concat(ESP.getFlashChipRealSize() / 1024);
+#else
+  // TODO
+  reply.concat(ESP.getFlashChipSize());
+#endif
+  reply.concat(F(" kB"));
+
+#if defined(ESP8266)
+  reply.concat(F("<TR><TD>Sketch Size/Free:<TD>"));
+  reply.concat(ESP.getSketchSize() / 1024);
+  reply.concat(F(" kB / "));
+  reply.concat(ESP.getFreeSketchSpace() / 1024);
+  reply.concat(F(" kB"));
+#endif
+
+  reply.concat(F("<TR><TD>STA MAC:<TD>"));
+  uint8_t mac[6];
+  uint8_t* macread = WiFi.macAddress(mac);
+  char macaddress[20];
+  sprintf_P(macaddress, PSTR("%02x:%02x:%02x:%02x:%02x:%02x"), macread[0], macread[1], macread[2], macread[3], macread[4], macread[5]);
+  reply.concat(macaddress);
+
+  reply.concat(F("<TR><TD>AP MAC:<TD>"));
+  macread = WiFi.softAPmacAddress(mac);
+  sprintf_P(macaddress, PSTR("%02x:%02x:%02x:%02x:%02x:%02x"), macread[0], macread[1], macread[2], macread[3], macread[4], macread[5]);
+  reply.concat(macaddress);
+
+  reply.concat(F("<TR><TD>ESP Chip ID:<TD>"));
+  sprintf_P(buff, PSTR("%06X"), ESP_getChipId());
+  reply.concat(buff);
+
+#if defined(ESP8266)
+  reply.concat(F("<TR><TD>Flash Chip ID:<TD>"));
+  sprintf_P(buff, PSTR("%08X"), ESP.getFlashChipId());
+  reply.concat(buff);
+#endif
+
+#if defined(ESP8266)
+  uint8_t stations = wifi_softap_get_station_num();
+
+  reply.concat(F("<TR><TD>Clients:<TD>"));
+  reply.concat(stations);
+#endif
+
+  reply.concat(F("</table></form>"));
+  server->send(200, FPSTR(TEXTHTML), reply);
+}
+
+void WiFiConfig::_handleRoot(void)
+{
+  String content;
+
+  content.reserve(3000);
+  content = FPSTR(PAGE_CAPTIVEPORTALCATCH); // 1. cast stranky
+// pridame informaci o stavu pokusu o pripojeni
+  content.concat(F("<div class=\"vl-info\">Pokus o připojení: "));
+#if defined(ESP8266)
+  switch (_status)
+  {
+  case STATION_IDLE:
+    content.concat(F("Klid"));
+    break;
+
+  case STATION_CONNECTING:
+    content.concat(F("Připojování"));
+    break;
+
+  case STATION_WRONG_PASSWORD:
+    content.concat(F("Špatné heslo"));
+    break;
+
+  case STATION_NO_AP_FOUND:
+    content.concat(F("AP nenalezen"));
+    break;
+
+  case STATION_CONNECT_FAIL:
+    content.concat(F("Připojení selhalo"));
+    break;
+
+  case STATION_GOT_IP:
+    content.concat(F("Získaná ip"));
+    break;
+
+  case 0xfe:
+    content.concat(F("Špatná EEPROM"));
+    break;
+
+  case 0xff:
+    content.concat(F("Vynucená konfigurace"));
+    break;
+
+  default:
+    content.concat(F("Neznámý"));
+    break;
+  }
+#else
+  content.concat(F("Prozatím nedostupné"));
+#endif
+  content.concat(F("</div>"));
+  content.concat(FPSTR(PAGE_CAPTIVEPORTALCATCH2)); // 2. cast stranky (ukonceni)
+  server->send(200, FPSTR(TEXTHTML), content);
+  _time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat
+}
+
+void WiFiConfig::_handleDisplayAP(void)
+{
+  String s;
+  String v;
+  String content;
+
+  _time = millis() + (360 * 1000); // spocitame si novy cas, kdy budeme modul restartovat (6 minut)
+  content.reserve(3000);
+  content = FPSTR(PAGE_INDEX1);
+  int n = WiFi.scanNetworks();
+  if (0 == n)
+  {
+    content.concat(FPSTR(PAGE_NO_SSID));
+  }
+  else
+  {
+    for (int i = 0; i < n; ++i)
+    {
+      int quality;
+
+      if (WiFi.RSSI(i) <= -100)
+        quality = 0;
+      else if (WiFi.RSSI(i) >= -50)
+        quality = 100;
+      else
+        quality = 2 * (WiFi.RSSI(i) + 100);
+
+      s = FPSTR(SSID_ITEM);
+      s.replace(F("{v}"), WiFi.SSID(i));
+      s.replace(F("{a}"), String(quality));
+#if defined(ESP8266)
+      s.replace(F("{s}"), (ENC_TYPE_NONE == WiFi.encryptionType(i)) ? F("") : F("l"));
+#else
+      s.replace(F("{s}"), (WIFI_AUTH_OPEN == WiFi.encryptionType(i)) ? F("") : F("l"));
+#endif
+      content.concat(s);
+    }
+  }
+  s = FPSTR(PAGE_INDEX2);
+  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(""));
+  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(""));
+  if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) == WIFIMODE_AP)
+    s.replace(F("{a}"), FPSTR(CHECKED));
+  else
+    s.replace(F("{a}"), F(""));
+  if (EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)) == IPCONFIG_STATIC)
+    s.replace(F("{c}"), FPSTR(CHECKED));
+  else
+    s.replace(F("{c}"), F(""));
+  s.replace(F("{i}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))).toString());
+  s.replace(F("{m}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))).toString());
+  s.replace(F("{g}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))).toString());
+  s.replace(F("{d}"), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))).toString());
+
+  uint8_t chan = EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel));
+  if ((chan < 1) || (chan > 13))
+    chan = 1; // neplatne cislo kanalu nahradime nejnizsim
+  s.replace(F("{ch}"), String(chan));
+
+  content.concat(s);
+
+// Uzivatelske parametry
+  if (_params)
+  {
+    content.concat(FPSTR(PAGE_PARAM_HDR));
+  }
+
+  WiFiConfigUsrParameter *up = _params;
+
+  while (NULL != up)
+  {
+    s = FPSTR(PAGE_PARAM);
+    s.replace(F("{t}"), up->getLabel());
+    s.replace(F("{n}"), up->getID());
+    s.replace(F("{l}"), String(up->getValueLength()));
+    s.replace(F("{v}"), up->getValue());
+    content.concat(s);
+    up = up->getNext();
+  }
+
+  content.concat(FPSTR(PAGE_END));
+  server->send(200, FPSTR(TEXTHTML), content);
+}
+
+void WiFiConfig::_handleSetAP(void)
+{
+  uint8_t mode;
+  String str;
+
+  str.reserve(128);
+  str = server->arg(F("_s"));
+  if (str.length() > 0)
+  {
+    EES_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str);
+
+    str = server->arg(F("_p"));
+    EES_storeString(configBase + offsetof(wificonfigarea_t, pass), elementSize(wificonfigarea_t, pass), str);
+
+    str = server->arg(F("_a"));
+    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
+      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
+    { // staticka ip konfigurace
+      IPAddress ipa;
+
+      EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_STATIC);
+      str = server->arg(F("_i"));
+      ipa.fromString(str);
+      setEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr), (uint32_t) ipa);
+
+      str = server->arg(F("_m"));
+      ipa.fromString(str);
+      setEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask), (uint32_t) ipa);
+
+      str = server->arg(F("_g"));
+      ipa.fromString(str);
+      setEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway), (uint32_t) ipa);
+
+      str = server->arg(F("_d"));
+      ipa.fromString(str);
+      setEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns), (uint32_t) ipa);
+    }
+
+// Uzivatelske parametry
+    for (int i = 0; i < server->args(); i++)
+    {
+      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());
+      }
+    }
+    EEPROM.commit(); // skutecne ulozime data
+  }
+  server->send_P(200, TEXTHTML, PAGE_SAVED);
+  delay(2000); // cekame na odeslani dat
+// nakonfigurujeme ESP dle nove nastavenych parametru
+  WiFi.disconnect(); // vsechno odpojime
+  WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci
+
+  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));
+
+  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();
+}
+
+// Start WiFi v rezimu AP pro nastaveni modulu
+wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
+{
+  String ssid = SETUP_SSID;
+
+  WiFi.persistent(false); // chranime flash pred zbytecnymi prepisy
+  dnsServer.reset(new DNSServer());
+#if defined(ESP8266)
+  server.reset(new ESP8266WebServer(80));
+#else
+  server.reset(new WebServer(80));
+#endif
+
+  /* Soft AP network parameters */
+  IPAddress apIP(172, 217, 28, 1);
+  IPAddress netMsk(255, 255, 255, 0);
+
+  WiFi.disconnect(); // pro jistotu se odpojime
+  WiFi.mode(WIFI_AP);
+
+  WiFi.softAPConfig(apIP, apIP, netMsk);
+  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(500); // dulezite - jinak se nevraci spravna IP adresa !!! (udajne od verze 2.3.0 uz neni nutne)
+
+  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)
+    cb(WCS_CONFIGSTART); // signalizujeme start konfiguracniho serveru
+// Nastavime handlery weboveho serveru pro konfiguraci
+  server->onNotFound(std::bind(&WiFiConfig::_handleNotFound, this));
+  server->on(F("/config"), std::bind(&WiFiConfig::_handleDisplayAP, this));
+  server->on(F("/s"), std::bind(&WiFiConfig::_handleSetAP, this));
+  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));
+  server->begin(); // startujeme webovy server
+  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 (millis() > _time)
+      {
+        DEBUG_MSG("AP timeout\r\n");
+        if (cb)
+          cb(WCS_CONFIGTIMEOUT); // signalizujeme timeout
+        break; // ukoncime cekani a vracime se
+      }
+    }
+  }
+// tady by asi melo byt zastaveni weboveho a dns serveru...
+  dnsServer->stop();
+  server->stop();
+  return WCR_TIMEOUT; // nepripojeno, vyprsel timeout konfiguracniho AP
+}
+
+// Testovani, zda se modul pripojil k AP
+bool WiFiConfig::_testWifi(wificonfig_cb cb)
+{
+  uint32_t startt = millis();
+
+#if !defined(ESP8266)
+// nakonfigurujeme ESP dle nove nastavenych parametru
+  WiFi.disconnect(); // vsechno odpojime
+
+  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));
+
+  switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
+  {
+  case WIFIMODE_STA:
+  {
+    DEBUG_MSG("STA mode.\r\n");
+    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 (strlen(WiFiDeviceName))
+    {
+      WiFi.setHostname(WiFiDeviceName); // nastavime jmeno zarizeni
+    }
+  }
+  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;
+  }
+#endif
+
+  DEBUG_MSG("Trying to connect.\r\n");
+  while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT)
+  {
+    if (WL_CONNECTED == WiFi.status())
+    {
+      DEBUG_MSG("Connected...\r\n");
+      if (cb)
+        cb(WCS_CONNECTED);
+      return true; // jsme pripojeni
+    }
+    yield();
+    if (cb)
+      cb(WCS_CONNECTING); // signalizujeme pokracujici pokus o spojeni
+  }
+  DEBUG_MSG("Not connected!\r\n");
+#if defined(ESP8266)
+  _status = wifi_station_get_connect_status();
+#else
+  _status = WiFi.status();
+#endif
+  return false; // pripojeni se nezdarilo
+}
+
+wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificonfig_cb cb)
+{
+  wificonfigresult_t result = WCR_OK; // predpokladame, ze se pripojeni podari
+
+  DEBUG_MSG("\r\n\r\n"); // oddeleni vypisu
+
+  configBase = configarea; // pocatek konfigurace v EEPROM
+  if (0 == forceConfigure)
+  {
+    DEBUG_MSG("Force config.\r\n");
+    _status = 0xff;
+    result = _setupAP(cb);
+  }
+  else
+  {
+#if defined(ESP8266)
+    if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) != WiFi.getMode())
+    { // 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
+#endif
+    {
+      switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
+      {
+      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))));
+        }
+        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
+        {
+          if (cb)
+            cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni
+          if (!_testWifi(cb))
+          {
+            result = _setupAP(cb); // modul se nepripojil - startujeme AP rezim
+          }
+        }
+      }
+      break;
+
+      case WIFIMODE_AP:
+        DEBUG_MSG("AP mode.\r\n");
+        if (cb)
+          cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o 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
+      }
+    }
+  }
+  return result; // mame vyreseno
+}
+
+wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, int timeout, wificonfig_cb cb = NULL)
+{
+
+  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
+}
+// EOF

src/WiFiConfig.h

@@ -2,7 +2,7 @@
  * @file WiFiConfig.h
  * @author Pavel Brychta, http://www.xpablo.cz
  *
- * Copyright (c) 2015,16,17 Pavel Brychta. All rights reserved.
+ * Copyright (c) 2015-18 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
@@ -24,12 +24,17 @@
  * 1. Pokud je forceConfigure ==0, tak se aktivuje WiFi v rezimu AP a cele ESP je mozne nastavit webovym rozhranim (pocitam s prenosem hodnoty nouzoveho tlacitka pri startu).
  * 2. Neni-li tlacitko stisknute, tak se vezme rezim prace a AP se nastavi dle nej (WIFI_STA a WIFI_AP)
  * 3. Pokud byl rezim prace WIFI_STA a ESP se nepripoji k zadne siti do casu WIFI_STA_CONNECT_TIMEOUT, tak se pokracuje jako kdyby bylo stisknute rekonfiguracni tlacitko
+ * Podrobnejsi informace o upravach chovani v jednotlivych verzich jsou v zahlavi .cpp souboru.
  */
 
 #ifndef __WiFiConfig_h__
 #define __WiFiConfig_h__
 
-#include <ESP8266WiFi.h>
+#if defined(ESP8266)
+ #include <ESP8266WiFi.h>
+#else
+ #include <WiFi.h>
+#endif
 #include <memory>
 
 #define elementSize(type, element) sizeof(((type *)0)->element)
@@ -41,9 +46,8 @@ typedef struct
 {
 	uint8_t mode; // rezim prace AP/STA
 	uint8_t ip; // konfigurace ip (staticka/DHCP)
-	char ssid[32]; // SSID site
+	char ssid[32 + 2]; // SSID site
-	char pass[64]; // heslo
+	char pass[64 + 2]; // heslo
-	char devname[32]; // 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
@@ -93,7 +97,7 @@ typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzi
  *  \param [in] len Delka retezce
  *  \return Vycteny retezec
  */
-String getEEPROMString(int start, int len);
+String getEEPROMString(unsigned int start, size_t len);
 
 /**
  *  \brief Ulozeni retezce do EEPROM
@@ -102,7 +106,7 @@ String getEEPROMString(int start, int len);
  *  \param [in] len Maximalni delka ulozeneho retezce
  *  \param [in] string Ukladany retezec
  */
-void setEEPROMString(int start, int len, String string);
+void setEEPROMString(unsigned int start, size_t len, String &string);
 
 /**
  *  \brief Ziskani nasi ip adresy
@@ -121,32 +125,43 @@ IPAddress getOurIP(void);
  */
 uint8_t * getOurMAC(uint8_t *mac);
 
+/**
+ * @brief      Ziskani 32 bitoveho cisla z EEPROM
+ *
+ * @param[in]  start  Pocatecni adresa, ze ktere se ziskava cislo.
+ *
+ * @return     Ziskane cislo.
+ */
 uint32_t getEEPROMuint32(int start);
 
+/**
+ * @brief      Ulozeni 32 bitoveho cisla do EEPROM
+ *
+ * @param[in]  start  Pocatecni adresa, kam cislo ukladame.
+ * @param[in]  val    Ukladana hodnota
+ */
 void setEEPROMuint32(int start, uint32_t val);
 
-extern char WiFiDeviceName[]; // jmeno zarizeni, pouzivane i pro DHCP
-
 class WiFiConfigUsrParameter
 {
   public:
-    WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, int length, storeparam_cb cb);
+    WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, unsigned int length, storeparam_cb cb);
 
     const char *getID();
     const char *getValue();
     const char *getLabel();
-    int         getValueLength();
+    int        getValueLength();
-	  void         setNext(WiFiConfigUsrParameter *n);
+	  void       setNext(WiFiConfigUsrParameter *n);
 	  WiFiConfigUsrParameter *getNext();
-	  void		setNewValue(const char *newval);
+	  void		   setNewValue(const char *newval);
   private:
     const char *_id;
     const char *_label;
     char       *_value;
     int         _length;
 
-	storeparam_cb _cb;
+	  storeparam_cb _cb;
-	WiFiConfigUsrParameter *_next;
+	  WiFiConfigUsrParameter *_next;
 
     friend class WiFiConfig;
 };
@@ -155,9 +170,9 @@ class WiFiConfig
 {
 public:
 	WiFiConfig(): _params(NULL), _timeout(0) {}
-	wificonfigresult_t begin(int configarea, uint8_t forceConfigure, wificonfig_cb cb);
+	wificonfigresult_t begin(int configarea, int forceConfigure, wificonfig_cb cb);
-	wificonfigresult_t begin(int configarea, uint8_t forceConfigure, int timeout, wificonfig_cb cb);
+	wificonfigresult_t begin(int configarea, int forceConfigure, int timeout, wificonfig_cb cb);
-    void addParameter(WiFiConfigUsrParameter *p);
+  void addParameter(WiFiConfigUsrParameter *p);
 private:
 	wificonfigresult_t _setupAP(wificonfig_cb cb);
 	void _handleDisplayAP(void);
@@ -167,8 +182,9 @@ private:
 	void _handleNotFound(); // CaptivePortal redirector
   void _handleRoot(); // jen jednoducha stranka kvuli CaptivePortalu umoznuje prejit na spravnou stranku (ale nedela to...)
   bool _testWifi(wificonfig_cb cb);
+  bool _storeString(unsigned int start, size_t maxlen, String &string); // sifrovany retezec, max 255 znaku
+  String _readString(unsigned int start, size_t maxlen); // sifrovany retezec, max. 255 znaku
 	WiFiConfigUsrParameter *_searchUsrParameter(const char *name);
-	void _plusDecode(String &s);
 
 	WiFiConfigUsrParameter *_params; // ukazatel na posledni zadany uzivatelsky parametr
 	int _timeout; // timeout pri cekani na konfiguraci

src/embHTML.h

@@ -1,5 +1,6 @@
-// file:///I:/MyProjects/PB_ESP8266_WiFiConfig_Vyvoj/doc/_testy/s?_s=SSID1&_p=heslo&_n=jmeno_zarizeni&_a=on&_st=on&_i=192.168.1.1&_m=255.255.255.0&_g=192.168.1.3&_d=192.168.1.3&{n}={v}
+// HTML data
 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">
@@ -25,17 +26,17 @@ function hSC(){if (document.getElementById('_st').checked){document.getElementBy
 
 /* Polozky nalezenych SSID
 {v} - SSID
-{a} - RSSI (primo v dBm)
+{a} - RSSI (%)
 {s} - bud nic, nebo 'l'>
+Rozsahy otestovany zde https://css-tricks.com/html5-meter-element/
 */
 static const char SSID_ITEM[] PROGMEM = R"=====(
-<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q {s}'><meter value="{a}" min="0" max="100" low="30" high="80" optimum="50" style="width: 70%;"></meter></span></div>
+<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q {s}'><meter value="{a}" min="0" low="30" optimum="70" high="60" max="100" style="width: 70%;"></meter></span></div>
 )=====";
 
 /* Zacatek formulare pro vyplneni
 {s} - SSID
 {p} - password
-{n} - Netbios name
 {a} - AP mode (checkbox)
 {ch}- cislo kanalu AP
 {c} - staticka IP konfigurace (checkbox)
@@ -46,9 +47,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">
@@ -56,12 +56,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();' {a}>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>