Posun verzi

Prodlouzeni timeoutu pro STA pripojeni
Oprava jmena magic cisla.
2020-05-26 10:58:16 +02:00 · 2020-05-26 10:55:14 +02:00 · 2020-04-07 08:38:52 +02:00 · 2020-04-07 07:30:51 +02:00 · 2020-04-06 17:37:23 +02:00 · 2020-03-24 08:13:56 +01:00
6 changed files with 853 additions and 724 deletions
--- a/examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino
+++ b/examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino
@ -1,16 +1,21 @@
+#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,8 +23,8 @@
 // Definice obsazeni EEPROM
 #define elementSize(type, element) sizeof(((type *)0)->element)
 #define countof(a) (sizeof(a) / sizeof(a[0]))
-typedef struct
-{
+typedef struct {
+    uint32_t magic; // kontrola spravneho obsahu EEPROM
    char devname[32 + 2]; // jmeno zarizeni (pro NBNS plati jen 16 znaku)
 } eepromconfig_t;

@ -28,7 +33,11 @@ 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)
@ -44,8 +53,7 @@ static void handleRoot(void)
 void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
 {

-  switch (state)
-  {
+    switch (state) {
    case WCS_CONNECTSTART:
        DEBUG_OUT(F("Starting connect...\r\n"));
        break;
@ -63,6 +71,10 @@ void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)

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

@ -79,9 +91,22 @@ void ICACHE_FLASH_ATTR setup()
    WiFiConfigUsrParameter devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname);

    EEPROM.begin(EEPROM_SIZE); // zahajujeme praci s EEPROM
+
+    uint32_t magic;
+
+    EEPROM.get(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
+    if (EEPROM_MAGIC != magic) {
+        // EEPROM ma spatny obsah
+        for (unsigned int i = 0; i < EEPROM_SIZE; i++)
+            EEPROM.write(i, 0);
+        magic = EEPROM_MAGIC;
+        EEPROM.put(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
+        EEPROM.commit();
+    }
+
    pinMode(PIN_FORCE_CONFIG, INPUT_PULLUP); // pin, co slouzi jako vstup tlacitka
    int fc = digitalRead(PIN_FORCE_CONFIG); // pozadavek na vynucene vyvolani konfigurace
-  Serial.begin(9600);
+    Serial.begin(115200);
    String dn = EES_readString(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, devname), elementSize(eepromconfig_t, devname));
    strcpy(WiFiDeviceName, dn.c_str());
    wifi.addParameter(&devname);
@ -92,8 +117,7 @@ void ICACHE_FLASH_ATTR setup()
    wwwserver.on("/", handleRoot);
    wwwserver.begin(); // startujeme webovy server

-  if (strlen(WiFiDeviceName) > 0)
-  {
+    if (strlen(WiFiDeviceName) > 0) {
        NBNS.begin(WiFiDeviceName);
        ArduinoOTA.setHostname(WiFiDeviceName);
    }
@ -108,8 +132,7 @@ void ICACHE_FLASH_ATTR setup()
        DEBUG_OUT(F("Error["));
        DEBUG_OUT(error);
        DEBUG_OUT(F("]: "));
-    switch (error)
-    {
+        switch (error) {
        case OTA_AUTH_ERROR:
            DEBUG_OUT(F("Auth Failed\r\n"));
            break;
--- a/library.json
+++ b/library.json
@ -12,7 +12,7 @@
    "type": "git",
    "url": "http://git.xpablo.cz/pablo2048/WiFiConfig.git"
  },
-  "version": "6.3.1",
+  "version": "6.3.4",
  "license": "MIT",
  "frameworks": "arduino",
  "platforms": ["espressif8266", "espressif32"],
--- a/library.properties
+++ b/library.properties
@ -1,5 +1,5 @@
 name=WiFiConfig
-version=6.3.1
+version=6.3.4
 author=Pavel Brychta
 maintainer=Pavel Brychta <Pablo@xpablo.cz>
 sentence=Enables seamless module configuration.
--- a/src/WiFiConfig.cpp
+++ b/src/WiFiConfig.cpp
@ -1,4 +1,11 @@
 /*
+ * v6.3.4-23.3.2020 - staticka konfigurace v AP rezimu funkcni
+ *
+ * v6.3.3-27.10.2019 - volani WS_CONNECTED i v pripade, ze bezi AP
+ *
+ * v6.3.2- 4.10.2019 - Informace o aplikaci a jeji verzi do footeru, zrychlen restart z 10 na 5 sekund, vylepsena stranka pro reset
+ *                      verze pro ESP32 zobrazuje neco malo informaci o stavu pripojeni a duvodu vstupu do WifiConfig
+ *
 * V6.3.1- 1.9.2019 - Odstraneni HTML5 validatoru - delaly akorat problemy a nedala se ulozit konfigurace i kdyz byly polozky skryty
 *
 * V6.3 - 12.8.2019 - IP adresa Captive portalu je zmenena na 172.217.28.1 kvuli funkcnosti na Android zarizenich (viz. zmena zde https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino)
@ -84,6 +91,7 @@
 # include <ESP8266WebServer.h>
 #else
 # include <WebServer.h>
+# include <rom/rtc.h> // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449)
 #endif
 #include "WiFiConfig.h"
 #include <EEPROM.h>
@ -111,15 +119,13 @@

 extern char WiFiDeviceName[];

-enum
-{
+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
-{
+enum {
    IPCONFIG_DHCP = 0x55, // DHCP konfigurace ip adres (default)
    IPCONFIG_STATIC = 0xaa // staticka konfigurace ip adres
 };
@ -142,8 +148,7 @@ IPAddress getOurIP(void)
    IPAddress ipa;
    WiFiMode_t wm = WiFi.getMode();

-  switch (wm)
-  {
+    switch (wm) {
    case WIFI_STA:
        ipa = WiFi.localIP();
        break;
@ -172,8 +177,7 @@ uint32_t getEEPROMuint32(unsigned int start)
 {
    uint32_t result = 0;

-  for (uint32_t i = 0; i < 4; ++i)
-  {
+    for (uint32_t i = 0; i < 4; ++i) {
        result <<= 8;
        result += EEPROM.read(start);
        ++start;
@ -184,8 +188,7 @@ uint32_t getEEPROMuint32(unsigned int start)
 void setEEPROMuint32(unsigned int start, uint32_t val)
 {

-  for (unsigned int i = 0; i < 4; ++i)
-  {
+    for (unsigned int i = 0; i < 4; ++i) {
        EEPROM.write(start + 3 - i, (uint8_t)val);
        val >>= 8;
    }
@ -195,8 +198,7 @@ String getEEPROMString(unsigned int start, size_t len)
 {
    String string = "";

-  for (unsigned int i = start; i < + start + len; ++i)
-  {
+    for (unsigned int i = start; i < + start + len; ++i) {
        uint8_t b = EEPROM.read(i);

        if ((0xff == b) || (0 == b))
@ -210,16 +212,12 @@ void setEEPROMString(unsigned int start, size_t len, String &string)
 {
    unsigned int si = 0;

-  for (unsigned int i = start; i < start + len; ++i)
-  {
+    for (unsigned int i = start; i < start + len; ++i) {
        char c;

-    if (si < string.length())
-    {
+        if (si < string.length()) {
            c = string[si];
-    }
-    else
-    {
+        } else {
            c = 0;
        }
        EEPROM.write(i, c);
@ -235,12 +233,10 @@ WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label
    _label = label;
    _length = length;
    _value = new char[length + 1];
-  for (unsigned int i = 0; i < length; i++)
-  {
+    for (unsigned int i = 0; i < length; i++) {
        _value[i] = 0;
    }
-  if (defaultValue != NULL)
-  {
+    if (defaultValue != NULL) {
        strncpy(_value, defaultValue, length);
    }
 }
@ -292,8 +288,7 @@ WiFiConfigUsrParameter *WiFiConfig::_searchUsrParameter(const char *name)
 {
    WiFiConfigUsrParameter *ptr = _params;

-  while (NULL != ptr)
-  {
+    while (NULL != ptr) {
        if (0 == strcmp(name, ptr->getID()))
            break;
        ptr = ptr->getNext();
@ -312,12 +307,9 @@ void WiFiConfig::_handleNotFound(void)

    DEBUG_MSG("Requested URI: %s\r\n", server->uri().c_str());

-  if (server->uri().endsWith(String(F("favicon.ico"))))
-  {
+    if (server->uri().endsWith(String(F("favicon.ico")))) {
        server->send_P(404, TEXTPLAIN, PSTR("Err"));
-  }
-  else
-  {
+    } else {
        String redirect;
        redirect.reserve(256);
        redirect = F("http://");
@ -334,8 +326,7 @@ void WiFiConfig::_handleReset(void)

    rsttick.reset(new(Ticker));

-  rsttick->once_ms(700, []()
-  {
+    rsttick->once_ms(700, []() {
        ESP.restart();
    });

@ -419,8 +410,7 @@ void WiFiConfig::_handleRoot(void)
 // pridame informaci o stavu pokusu o pripojeni
    content.concat(F("<div class=\"vl-info\">Pokus o připojení: "));
 #if defined(ESP8266)
-  switch (_status)
-  {
+    switch (_status) {
    case STATION_IDLE:
        content.concat(F("Klid"));
        break;
@ -458,7 +448,23 @@ void WiFiConfig::_handleRoot(void)
        break;
    }
 #else
-  content.concat(F("Prozatím nedostupné"));
+    switch (_status) {
+    case WL_CONNECT_FAILED:
+        content.concat(F("Připojení selhalo"));
+        break;
+
+    case 0xfe:
+        content.concat(F("Špatná EEPROM"));
+        break;
+
+    case 0xff:
+        content.concat(F("Vynucená konfigurace"));
+        break;
+
+    default:
+        content.concat(F("Neznámý"));
+        break;
+    }
 #endif
    content.concat(F("</div>"));
    content.concat(FPSTR(PAGE_CAPTIVEPORTALCATCH2)); // 2. cast stranky (ukonceni)
@ -476,14 +482,10 @@ void WiFiConfig::_handleDisplayAP(void)
    content.reserve(3000);
    content = FPSTR(PAGE_INDEX1);
    int n = WiFi.scanNetworks();
-  if (0 == n)
-  {
+    if (0 == n) {
        content.concat(FPSTR(PAGE_NO_SSID));
-  }
-  else
-  {
-    for (int i = 0; i < n; ++i)
-    {
+    } else {
+        for (int i = 0; i < n; ++i) {
            int quality;

            if (WiFi.RSSI(i) <= -100)
@ -536,15 +538,13 @@ void WiFiConfig::_handleDisplayAP(void)
    content.concat(s);

 // Uzivatelske parametry
-  if (_params)
-  {
+    if (_params) {
        content.concat(FPSTR(PAGE_PARAM_HDR));
    }

    WiFiConfigUsrParameter *up = _params;

-  while (NULL != up)
-  {
+    while (NULL != up) {
        s = FPSTR(PAGE_PARAM);
        s.replace(F("{t}"), up->getLabel());
        s.replace(F("{n}"), up->getID());
@ -565,29 +565,26 @@ void WiFiConfig::_handleSetAP(void)

    str.reserve(128);
    str = server->arg(F("_s"));
-  if (str.length() > 0)
-  {
+    if (str.length() > 0) {
        EES_storeString(configBase + offsetof(wificonfigarea_t, ssid), elementSize(wificonfigarea_t, ssid), str);

        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)
-    {
+        if (str.length() > 0) {
            mode = WIFIMODE_AP; // rezim AP
            str = server->arg(F("_ch")); // kanal AP
            EEPROM.write(configBase + offsetof(wificonfigarea_t, apchannel), (uint8_t)str.toInt());
-    }
-    else
+        } else
            mode = WIFIMODE_STA; // rezim STA
        EEPROM.write(configBase + offsetof(wificonfigarea_t, mode), mode);

        str = server->arg(F("_st"));
        if (0 == str.length())
            EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_DHCP); // mame DHCP dynamickou konfiguraci
-    else
-    { // staticka ip konfigurace
+        else {
+            // staticka ip konfigurace
            IPAddress ipa;

            EEPROM.write(configBase + offsetof(wificonfigarea_t, ip), IPCONFIG_STATIC);
@ -609,10 +606,8 @@ void WiFiConfig::_handleSetAP(void)
        }

 // 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
-      {
+        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());
@ -623,25 +618,21 @@ void WiFiConfig::_handleSetAP(void)
    server->send_P(200, TEXTHTML, PAGE_SAVED);
    delay(2000); // cekame na odeslani dat
 // nakonfigurujeme ESP dle nove nastavenych parametru
-  WiFi.disconnect(); // vsechno odpojime
    WiFi.persistent(true); // chceme, aby si modul zapamatoval konfiguraci
+    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:
-  {
+    switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode))) {
+    case WIFIMODE_STA: {
        DEBUG_MSG("STA mode.\r\n");
 #if defined(ESP8266)
-    if (strlen(WiFiDeviceName))
-    {
+        if (strlen(WiFiDeviceName)) {
            WiFi.hostname(WiFiDeviceName); // nastavime jmeno zarizeni
        }
 #endif
-    if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-    {
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
            DEBUG_MSG("Static configuration.\r\n");
            WiFi.config(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                        IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, dns))));
@ -650,8 +641,7 @@ void WiFiConfig::_handleSetAP(void)
        WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
        WiFi.begin(s.c_str(), pass.c_str());
 #if !defined(ESP8266)
-    if (strlen(WiFiDeviceName))
-    {
+        if (strlen(WiFiDeviceName)) {
            WiFi.setHostname(WiFiDeviceName); // nastavime jmeno zarizeni
        }
 #endif
@ -668,18 +658,14 @@ void WiFiConfig::_handleSetAP(void)
    case WIFIMODE_AP:
        DEBUG_MSG("AP mode.\r\n");
        WiFi.mode(WIFI_AP); // startujeme AP
-    if (pass.length())
-    {
+        if (pass.length()) {
            // je zadane heslo do AP
            WiFi.softAP(s.c_str(), pass.c_str(), EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
-    }
-    else
-    {
+        } else {
            // otevreny AP
            WiFi.softAP(s.c_str(), NULL, EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
        }
-    if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-    {
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
            WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                              IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
        }
@ -712,19 +698,30 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
    IPAddress netMsk(255, 255, 255, 0);

    WiFi.disconnect(); // pro jistotu se odpojime
-  WiFi.mode(WIFI_AP);
+//    WiFi.mode(WIFI_AP);

+#if defined(ARDUINO_ARCH_ESP8266)
    WiFi.softAPConfig(apIP, apIP, netMsk);
-  if (ssid.endsWith(F("?")))
-  {
+    if (ssid.endsWith(F("?"))) {
        char lmac[16];

        sprintf_P(lmac, PSTR("%06X"), ESP_getChipId());
        ssid.replace(F("?"), String(lmac));
    }
    WiFi.softAP(ssid.c_str(), NULL, SETUP_CHANNEL);
+    WiFi.mode(WIFI_AP);
    delay(500); // dulezite - jinak se nevraci spravna IP adresa !!! (udajne od verze 2.3.0 uz neni nutne)
+#else
+    // osetreni padu ESP32 - https://github.com/espressif/arduino-esp32/issues/2025
+    if (ssid.endsWith(F("?"))) {
+        char lmac[16];

+        sprintf_P(lmac, PSTR("%06X"), ESP_getChipId());
+        ssid.replace(F("?"), String(lmac));
+    }
+    WiFi.softAP(ssid.c_str(), NULL, SETUP_CHANNEL);
+    WiFi.softAPConfig(apIP, apIP, netMsk);
+#endif
    dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
    dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); // spustime tzv. Captive portal - vsechny DNS dotazy jsou smerovany na nasi ip adresu
    if (cb)
@ -736,18 +733,45 @@ wificonfigresult_t WiFiConfig::_setupAP(wificonfig_cb cb)
    server->on(F("/r"), std::bind(&WiFiConfig::_handleReset, this));
    server->on(F("/i"), std::bind(&WiFiConfig::_handleInfo, this));
    server->on(F("/index.htm"), std::bind(&WiFiConfig::_handleRoot, this));
+#ifdef USE_WIFICONFIG_OTAUPDATE
+    server->on(F("/u"), []() {
+        server->send_P(200, TEXTHTML, PAGE_UPDATE);
+    });
+    server->on(F("/update"), HTTP_POST, []() {
+        server->sendHeader(F("Connection"), F("close"));
+        server->send(200, FPSTR(TEXTPLAIN), (Update.hasError()) ? F("FAIL") : F("OK"));
+        ESP.restart();
+    }, []() {
+        HTTPUpload& upload = server->upload();
+        if (upload.status == UPLOAD_FILE_START) {
+            WiFiUDP::stopAll();
+            uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+            if (!Update.begin(maxSketchSpace)) { //start with max available size
+                //Update.printError(Serial);
+            }
+        } else if (upload.status == UPLOAD_FILE_WRITE) {
+            if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+                //Update.printError(Serial);
+            }
+        } else if (upload.status == UPLOAD_FILE_END) {
+            if (Update.end(true)) { //true to set the size to the current progress
+                //Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
+            } else {
+                //Update.printError(Serial);
+            }
+        }
+        yield();
+    });
+#endif
    server->begin(); // startujeme webovy server
-  while (1)
-  {
+    while (1) {
        server->handleClient(); // osetrujeme praci serveru
        if (cb)
            cb(WCS_CONFIGWAIT); // volame uzivatelsky callback (napr. signalizace)
        dnsServer->processNextRequest();
        yield(); // procesy uvnitr systemu ESP potrebuji take svuj cas
-    if (_timeout)
-    {
-      if (millis() > _time)
-      {
+        if (_timeout) {
+            if (millis() > _time) {
                DEBUG_MSG("AP timeout\r\n");
                if (cb)
                    cb(WCS_CONFIGTIMEOUT); // signalizujeme timeout
@ -773,13 +797,10 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
    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:
-  {
+    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)))
-    {
+        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))));
@ -788,8 +809,7 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
        WiFi.mode(WIFI_STA); // startujeme WiFi v rezimu klienta
        WiFi.begin(s.c_str(), pass.c_str());
        DEBUG_MSG("STA params: %s, %s\r\n", s.c_str(), pass.c_str());
-    if (strlen(WiFiDeviceName))
-    {
+        if (strlen(WiFiDeviceName)) {
            WiFi.setHostname(WiFiDeviceName); // nastavime jmeno zarizeni
        }
    }
@ -798,21 +818,19 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
    case WIFIMODE_AP:
        DEBUG_MSG("AP mode.\r\n");
        WiFi.mode(WIFI_AP); // startujeme AP
-    if (pass.length())
-    {
+        if (pass.length()) {
            // je zadane heslo do AP
            WiFi.softAP(s.c_str(), pass.c_str(), EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
-    }
-    else
-    {
+        } else {
            // otevreny AP
            WiFi.softAP(s.c_str(), NULL, EEPROM.read(configBase + offsetof(wificonfigarea_t, apchannel)));
        }
-    if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip)))
-    {
+        if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
            WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
                              IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
        }
+        if (cb)
+            cb(WCS_CONNECTED);
        break;

    default: // jakykoliv neznamy rezim (mozna zavada na EEPROM???)
@ -822,10 +840,8 @@ bool WiFiConfig::_testWifi(wificonfig_cb cb)
 #endif

    DEBUG_MSG("Trying to connect.\r\n");
-  while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT)
-  {
-    if (WL_CONNECTED == WiFi.status())
-    {
+    while ((millis() - startt) < WIFI_STA_CONNECT_TIMEOUT) {
+        if (WL_CONNECTED == WiFi.status()) {
            DEBUG_MSG("Connected...\r\n");
            if (cb)
                cb(WCS_CONNECTED);
@ -851,35 +867,28 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon
    DEBUG_MSG("\r\n\r\n"); // oddeleni vypisu

    configBase = configarea; // pocatek konfigurace v EEPROM
-  if (0 == forceConfigure)
-  {
+    if (0 == forceConfigure) {
        DEBUG_MSG("Force config.\r\n");
        _status = 0xff;
        result = _setupAP(cb);
-  }
-  else
-  {
+    } else {
 #if defined(ESP8266)
-    if (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)) != WiFi.getMode())
-    { // neshoduje se rezim - musime spustit konfiguracni AP (poskozena konfigurace)
+        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
+        } else
 #endif
        {
-      switch (EEPROM.read(configBase + offsetof(wificonfigarea_t, mode)))
-      {
-      case WIFIMODE_STA:
-      {
+            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)))
-        {
+                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))));
@ -887,12 +896,10 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon
                DEBUG_MSG("STA mode.\r\n");
                if (WC_DONT_RUN_CONFIGAP == _timeout)
                    result = WCR_CONFIGAP_NOT_STARTED; // nemame spoustet konfiguracni AP - vracime se hned
-        else
-        {
+                else {
                    if (cb)
                        cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni
-          if (!_testWifi(cb))
-          {
+                    if (!_testWifi(cb)) {
                        result = _setupAP(cb); // modul se nepripojil - startujeme AP rezim
                    }
                }
@ -901,8 +908,12 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, wificon

            case WIFIMODE_AP:
                DEBUG_MSG("AP mode.\r\n");
+                if (IPCONFIG_STATIC == EEPROM.read(configBase + offsetof(wificonfigarea_t, ip))) {
+                    WiFi.softAPConfig(IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, ipaddr))), IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, gateway))),
+                              IPAddress(getEEPROMuint32(configBase + offsetof(wificonfigarea_t, netmask))));
+                }
                if (cb)
-          cb(WCS_CONNECTSTART); // signalizujeme zacatek pokusu o pripojeni (zde se nic jineho stejne nestane...)
+                    cb(WCS_CONNECTED); // signalizujeme pripojeni (zde se nic jineho stejne nestane...)
                break;

 #if !defined(ESP8266)
--- 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-20 Pavel Brychta. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@ -42,8 +42,7 @@
 #define WC_DONT_RUN_CONFIGAP -1 // priznak, ze si neprejeme spoustet konfiguracni AP (uziva se misto parametru timeout). Urceno pro bateriove napajene pristroje

 // Struktura konfigurace, ulozena v EEPROM
-typedef struct
-{
+typedef struct {
    uint8_t mode; // rezim prace AP/STA
    uint8_t ip; // konfigurace ip (staticka/DHCP)
    char ssid[32 + 2]; // SSID site
@ -56,19 +55,17 @@ typedef struct
 } wificonfigarea_t;

 // Parametr, predany uzivatelske callback funkci, urceny pro aplikacni vizualizaci stavu konfigurace a pripojeni
-typedef enum
-{
+typedef enum {
    WCS_CONNECTSTART = 0, // zacatek pokusu o pripojeni k ulozene konfiguraci
    WCS_CONNECTING = 1, // probiha pokus o pripojeni
-	WCS_CONNECTED = 2, // pripojeni bylo uspesne
+    WCS_CONNECTED = 2, // pripojeni bylo uspesne/byl spusteny AP
    WCS_CONFIGSTART = 3, // zacatek startu konfiguracniho AP
    WCS_CONFIGWAIT = 4, // cekame na nastaveni konfigurace pres web
    WCS_CONFIGTIMEOUT = 5, // doslo k vyprseni timeoutu konfigurace, budeme se vracet s False jako vysledek z .begin(...)
 } wificonfigstate_t;

 // Navratovy parametr z volani begin() - udava, jak se podarilo WiFiConfig modulu pripojit k AP
-typedef enum
-{
+typedef enum {
    WCR_OK = 0, // wifi pripojena/AP nastartovane (dle parametru v EEPROM)
    WCR_TIMEOUT = 1, // wifi neni pripojena a vyprsel zadany timeout
    WCR_CONFIGAP_NOT_STARTED = 2, // wifi neni pripojena a spusteni konfiguracniho AP bylo zakazane parametrem timeout (WC_DONT_RUN_CONFIGAP)
@ -79,7 +76,7 @@ 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
--- a/src/embHTML.h
+++ b/src/embHTML.h
@ -21,7 +21,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>ESP WiFiConfig</h1><div style='text-align:left;display:inline-block;min-width:260px;'>
 )=====";

 /* Polozky nalezenych SSID
@ -81,9 +81,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 +104,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 +119,101 @@ static const char PAGE_CAPTIVEPORTALCATCH[] PROGMEM = R"=====(
 <style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;}
 .vl-info {border-left: thick solid #1fa3ec;background: #cee6ff; text-align:left; display:inline-block; min-width:260px; margin-top:15px}
 .red { background-color: #ff0000;}
+.magenta { background-color: #ff00ff;}
 </style>
 </head><body><div style='text-align:left;display:inline-block;min-width:260px;'>
-<form action="/config" method="get"><button>Konfigurace WiFi</button></form><br/><form action="/i" method="get"><button>Informace o modulu</button></form><br/><form action="/r" method="post"><button class="red">Reset</button></form><br>
-)=====";
+<form action="/config" method="get">
+<button>Konfigurace WiFi</button>
+</form><br/>
+<form action="/i" method="get">
+<button>Informace o modulu</button>
+</form><br/><form action="/r" method="post">
+<button class="red">Reset</button></form><br>)====="
+#if defined USE_WIFICONFIG_OTAUPDATE
+R"=====(
+</form><br/><form action="/u" method="get">
+<button class="magenta">Aktualizace firmware</button></form><br>)====="
+#endif
+;

-// druha cast (mezi 1. a druhou cast muzeme doplnit dodatecne informace)
+// druha cast (mezi 1. a 2. cast muzeme doplnit dodatecne informace)
 static const char PAGE_CAPTIVEPORTALCATCH2[] PROGMEM = R"=====(
-</div></body></html>
+</div>
+)====="
+#if defined APP_NAME && defined APP_VERSION
+R"=====(<div style='text-align:right;font-size:11px;'><hr/>)====="
+APP_NAME
+" v"
+APP_VERSION
+R"=====(</div>
+)====="
+#else
+R"=====(<div style='text-align:right;font-size:11px;'><hr/><a href='http://xpablo.cz' target='_blank' style='color:#aaa;'>WiFiConfig by xPablo</a></div>)====="
+#endif
+R"=====(</body></html>
 )=====";

 static const char PAGE_RESTART[] PROGMEM = R"=====(
+<!DOCTYPE html><html lang="cs"><head><meta http-equiv="refresh" content="5;url=/"/>
+<meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1"/>
+<title>xPablo Setup - Restart</title>
+<style>div,input {margin-bottom: 5px;}body{width:200px;display:block;margin-left:auto;margin-right:auto;}</style>
+</head><body>
 Restartuji...
+</body></html>
+)=====";
+
+static const char PAGE_UPDATE[] PROGMEM = R"=====(
+<html lang='en'>
+  <head>
+    <meta charset='utf-8'>
+    <meta name='viewport' content='width=device-width,initial-scale=1'/>
+  </head>
+  <body>
+<form method="POST" action="#" enctype="multipart/form-data" id="upload_form">
+  <input type="file" name="update" accept='.bin' id="file">
+  <input type="submit" value="Update"> </form>
+<div id="prg_wrap" style="border: 0px solid; width: 100%;">
+  <div id="prg" style="text-shadow: 2px 2px 3px black; padding: 5px 0; display: none; border: 1px solid #008aff; background: #002180; text-align: center; color: white;"></div>
+</div>
+<script>
+var domReady = function(callback) {
+  document.readyState === "interactive" || document.readyState === "complete" ? callback() : document.addEventListener("DOMContentLoaded", callback);
+};
+domReady(function() {
+  var myform = document.getElementById('upload_form');
+  var filez = document.getElementById('file');
+  myform.onsubmit = function(event) {
+    event.preventDefault();
+    var formData = new FormData();
+    var file = filez.files[0];
+    if(!file) {
+      return false;
+    }
+    formData.append("files", file, file.name);
+    var xhr = new XMLHttpRequest();
+    xhr.upload.addEventListener("progress", function(evt) {
+      if(evt.lengthComputable) {
+        var per = Math.round((evt.loaded / evt.total) * 100);
+        var prg = document.getElementById('prg');
+        prg.innerHTML = per + "%"
+        prg.style.width = per + "%"
+        prg.style.display = "block"
+      }
+    }, false);
+    xhr.open('POST', location.href, true);
+    // Set up a handler for when the request finishes.
+    xhr.onload = function() {
+      if(xhr.status === 200) {
+        //alert('Success');
+      } else {
+        //alert('An error occurred!');
+      }
+    };
+    xhr.send(formData);
+  }
+});
+</script>
+</body>
+</html>
 )=====";
Author	SHA1	Message	Date
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