Ukladani default konfigurace je funkcni, odstranena obsolete funkcnost

Moznost nadefinovat vlastni titulek pro webovou stranku a popisku v prohlizeci
Jina aktivace noveho nastaveni. TODO: prekontrolovat, zda neni mozne metodu vyuzit i pri ukladani nove konfigurace z webu
2021-02-27 10:56:20 +01:00 · 2020-11-28 11:40:28 +01:00 · 2020-10-22 08:52:26 +02:00 · 2020-10-20 07:51:23 +02:00 · 2020-10-20 07:43:52 +02:00 · 2020-10-17 12:50:42 +02:00
6 changed files with 938 additions and 750 deletions
--- a/examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino
+++ b/examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino
@ -1,16 +1,21 @@
-#include <ESP8266WiFi.h>
-#include <ESP8266WebServer.h>
+#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)
@ -18,9 +23,9 @@
 // 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)
+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!!!)
@ -28,118 +33,136 @@ typedef struct
 #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)
 {

-  content = F("<!DOCTYPE HTML>\n<html>Hello world from ESP8266");
-  content += F("<p>");
-  content += F("</html>");
+    content = F("<!DOCTYPE HTML>\n<html>Hello world from ESP8266");
+    content += F("<p>");
+    content += F("</html>");

-  wwwserver.send(200, "text/html", content);
+    wwwserver.send(200, "text/html", content);
 }

 void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
 {

-  switch (state)
-  {
+    switch (state) {
    case WCS_CONNECTSTART:
-      DEBUG_OUT(F("Starting connect...\r\n"));
-      break;
+        DEBUG_OUT(F("Starting connect...\r\n"));
+        break;

    case WCS_CONNECTING:
-      break;
+        break;

    case WCS_CONNECTED:
-      DEBUG_OUT(F("Connected.\r\n"));
-      break;
+        DEBUG_OUT(F("Connected.\r\n"));
+        break;

    case WCS_CONFIGSTART:
-      DEBUG_OUT(F("Starting config...\r\n"));
-      break;
+        DEBUG_OUT(F("Starting config...\r\n"));
+        break;

    case WCS_CONFIGWAIT:
-      break;
-  }
+        break;
+
+    case WCS_CONFIGTIMEOUT:
+        DEBUG_OUT(F("Config timeout...\r\n"));
+        break;
+    }
 }

 void ICACHE_FLASH_ATTR saveDevname(const char *param)
 {
-  String p = param;
+    String p = param;

-  EES_storeString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname), p);
+    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 devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname);
+    WiFiConfig wifi; // konfigurace ESP modulu
+    WiFiConfigUsrParameter devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname);

-  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);
-  String dn = EES_readString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname));
-  strcpy(WiFiDeviceName, dn.c_str());
-  wifi.addParameter(&devname);
+    EEPROM.begin(EEPROM_SIZE); // zahajujeme praci s EEPROM

-  if (WCR_OK != wifi.begin(EEPROM_WIFICONFIG_ORIGIN, fc, wcb)) // startujeme pripojeni
-    ESP.restart();
+    uint32_t magic;

-  wwwserver.on("/", handleRoot);
-  wwwserver.begin(); // startujeme webovy server
-
-  if (strlen(WiFiDeviceName) > 0)
-  {
-    NBNS.begin(WiFiDeviceName);
-    ArduinoOTA.setHostname(WiFiDeviceName);
-  }
-
-  ArduinoOTA.onStart([]() {
-    DEBUG_OUT(F("Start\r\n"));
-  });
-  ArduinoOTA.onEnd([]() {
-    DEBUG_OUT(F("End\r\n"));
-  });
-  ArduinoOTA.onError([](ota_error_t error) {
-    DEBUG_OUT(F("Error["));
-    DEBUG_OUT(error);
-    DEBUG_OUT(F("]: "));
-    switch (error)
-    {
-      case OTA_AUTH_ERROR:
-        DEBUG_OUT(F("Auth Failed\r\n"));
-        break;
-
-      case OTA_BEGIN_ERROR:
-        DEBUG_OUT(F("Begin Failed\r\n"));
-        break;
-
-      case OTA_CONNECT_ERROR:
-        DEBUG_OUT(F("Connect Failed\r\n"));
-        break;
-
-      case OTA_RECEIVE_ERROR:
-        DEBUG_OUT(F("Receive Failed\r\n"));
-        break;
-
-      case OTA_END_ERROR:
-        DEBUG_OUT(F("End Failed\r\n"));
-        break;
-
-      default:
-        DEBUG_OUT(F("\r\n"));
+    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();
    }
-  });
-  ArduinoOTA.begin();
+
+    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(115200);
+    String dn = EES_readString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname));
+    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) {
+        NBNS.begin(WiFiDeviceName);
+        ArduinoOTA.setHostname(WiFiDeviceName);
+    }
+
+    ArduinoOTA.onStart([]() {
+        DEBUG_OUT(F("Start\r\n"));
+    });
+    ArduinoOTA.onEnd([]() {
+        DEBUG_OUT(F("End\r\n"));
+    });
+    ArduinoOTA.onError([](ota_error_t error) {
+        DEBUG_OUT(F("Error["));
+        DEBUG_OUT(error);
+        DEBUG_OUT(F("]: "));
+        switch (error) {
+        case OTA_AUTH_ERROR:
+            DEBUG_OUT(F("Auth Failed\r\n"));
+            break;
+
+        case OTA_BEGIN_ERROR:
+            DEBUG_OUT(F("Begin Failed\r\n"));
+            break;
+
+        case OTA_CONNECT_ERROR:
+            DEBUG_OUT(F("Connect Failed\r\n"));
+            break;
+
+        case OTA_RECEIVE_ERROR:
+            DEBUG_OUT(F("Receive Failed\r\n"));
+            break;
+
+        case OTA_END_ERROR:
+            DEBUG_OUT(F("End Failed\r\n"));
+            break;
+
+        default:
+            DEBUG_OUT(F("\r\n"));
+        }
+    });
+    ArduinoOTA.begin();

 }

 void loop()
 {
-  wwwserver.handleClient(); // osetrujeme praci serveru
-  ArduinoOTA.handle();
+    wwwserver.handleClient(); // osetrujeme praci serveru
+    ArduinoOTA.handle();
 }
--- a/library.json
+++ b/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.3.1",
+  "version": "6.4.0",
  "license": "MIT",
  "frameworks": "arduino",
  "platforms": ["espressif8266", "espressif32"],
--- a/library.properties
+++ b/library.properties
@ -1,9 +1,9 @@
 name=WiFiConfig
-version=6.3.1
+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
--- a/src/WiFiConfig.cpp
+++ b/src/WiFiConfig.cpp
--- a/src/WiFiConfig.h
+++ b/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
@ -31,9 +31,9 @@
 #define __WiFiConfig_h__

 #if defined(ESP8266)
- #include <ESP8266WiFi.h>
+# include <ESP8266WiFi.h>
 #else
- #include <WiFi.h>
+# include <WiFi.h>
 #endif
 #include <memory>

@ -42,52 +42,62 @@
 #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
-{
-	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
-	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
-	uint32_t dns; // ip adresa DNS serveru v pripade staticke konfigurace
-	uint8_t apchannel; // kanal, na kterem pracuje AP (pokud je zapnuty rezim AP)
+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
+    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
+    uint32_t dns; // ip adresa DNS serveru v pripade staticke konfigurace
+    uint8_t apchannel; // kanal, na kterem pracuje AP (pokud je zapnuty rezim AP)
 } wificonfigarea_t;

 // Parametr, predany uzivatelske callback funkci, urceny pro aplikacni vizualizaci stavu konfigurace a pripojeni
-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_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;
+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/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
-{
-	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;
+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
- #define SETUP_SSID "ESPPBSetup_?"
+# define SETUP_SSID "ESPPBSetup_?"
 #endif

 #ifndef SETUP_CHANNEL
- #define SETUP_CHANNEL 3
+# define SETUP_CHANNEL 3
 #endif

 /**
@ -144,24 +154,24 @@ void setEEPROMuint32(int start, uint32_t val);

 class WiFiConfigUsrParameter
 {
-  public:
+public:
    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();
-	  void       setNext(WiFiConfigUsrParameter *n);
-	  WiFiConfigUsrParameter *getNext();
-	  void		   setNewValue(const char *newval);
-  private:
+    void       setNext(WiFiConfigUsrParameter *n);
+    WiFiConfigUsrParameter *getNext();
+    void         setNewValue(const char *newval);
+private:
    const char *_id;
    const char *_label;
    char       *_value;
    int         _length;

-	  storeparam_cb _cb;
-	  WiFiConfigUsrParameter *_next;
+    storeparam_cb _cb;
+    WiFiConfigUsrParameter *_next;

    friend class WiFiConfig;
 };
@ -169,26 +179,30 @@ class WiFiConfigUsrParameter
 class WiFiConfig
 {
 public:
-	WiFiConfig(): _params(NULL), _timeout(0) {}
-	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);
-private:
-	wificonfigresult_t _setupAP(wificonfig_cb cb);
-	void _handleDisplayAP(void);
-	void _handleSetAP(void);
-  void _handleInfo(void);
-  void _handleReset(void);
-	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);
+    WiFiConfig(): _params(NULL), _timeout(0) {}
+    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);

-	WiFiConfigUsrParameter *_params; // ukazatel na posledni zadany uzivatelsky parametr
-	int _timeout; // timeout pri cekani na konfiguraci
-	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
+private:
+    void _prepareWifi(void);
+    wificonfigresult_t _setupAP(wificonfig_cb cb);
+    void _handleDisplayAP(void);
+    void _handleSetAP(void);
+    void _handleInfo(void);
+    void _handleReset(void);
+    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);
+
+    WiFiConfigUsrParameter *_params; // ukazatel na posledni zadany uzivatelsky parametr
+    int _timeout; // timeout pri cekani na konfiguraci
+    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
--- a/src/embHTML.h
+++ b/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
@ -81,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>
@ -91,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>
 )=====";

@ -106,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"=====(
-  Restartuji...
+<!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>
 )=====";
Author	SHA1	Message	Date
Pablo2048	6f845e1e45	Ukladani default konfigurace je funkcni, odstranena obsolete funkcnost	2021-02-27 10:56:20 +01:00
Pablo2048	170af78f28	Moznost nadefinovat vlastni titulek pro webovou stranku a popisku v prohlizeci	2020-11-28 11:40:28 +01:00
Pavel Brychta	dd4204c7a1	Jina aktivace noveho nastaveni. TODO: prekontrolovat, zda neni mozne metodu vyuzit i pri ukladani nove konfigurace z webu	2020-10-22 08:52:26 +02:00
Pavel Brychta	4cdce88ca5	Osetreni SSID, konciciho znakem ?, aktivace noveho nastaveni (pozor!!! mozna je problem se statickymi ip adresami - proverit...	2020-10-20 07:51:23 +02:00
Pavel Brychta	6f1dd6a7ba	Inicializace AP kanalu	2020-10-20 07:43:52 +02:00
Pablo2048	11aaf8450f	Priprava na ukladani predpripravene/default konfigurace	2020-10-17 12:50:42 +02:00
Pavel Brychta	2353bfa617	Merge pull request 'feature/APSTA' (#8 ) from feature/APSTA into master Reviewed-on: #8	2020-08-21 14:04:57 +02:00
Pavel Brychta	7ea5b222ad	Cekani na start AP pro ESP32	2020-08-21 14:03:36 +02:00
Pavel Brychta	f42c8a1bf3	Priprava pro rezim APSTA (bezi jak STA, tak AP)	2020-06-23 10:15:28 +02:00
Pavel Brychta	8d709429e0	Posun verzi	2020-05-26 10:58:16 +02:00
Pavel Brychta	e83160d3d2	Prodlouzeni timeoutu pro STA pripojeni	2020-05-26 10:55:14 +02:00
Pavel Brychta	baef6c322e	Oprava jmena magic cisla.	2020-04-07 08:38:52 +02:00
Pavel Brychta	349bc68180	Oprava padu ESP32 pri pokusu o iskani adresy pres DHCP (odkaz na popis chyby do githubu je v kodu)	2020-04-07 07:30:51 +02:00
Pavel Brychta	8a95f6d69b	Example i pro ESP32	2020-04-06 17:37:23 +02:00
Pavel Brychta	26a65f00ac	Staticka ip konfigurace v rezimu AP je funkcni.	2020-03-24 08:13:56 +01:00
Pavel Brychta	48f3d58f7e	Fix. posledniho odevzdani	2019-10-27 13:15:59 +01:00
Pavel Brychta	304618c722	Signalizace pripojeni pri startu AP	2019-10-27 13:11:32 +01:00
Pavel Brychta	c6f3e3371c	Optimalizace i pro ESP32, moznost uploadu firmware	2019-10-11 16:17:54 +02:00
Pavel Brychta	52648c8915	Footer, info pro ESP32, lepsi reset stranka	2019-10-04 19:30:14 +02:00
Pavel Brychta	e66a3306f1	Navrh na footer	2019-10-04 13:03:23 +02:00
Pavel Brychta	4033637b82	Indikace stavu pripojeni pro ESP32	2019-10-04 10:50:35 +02:00