diff --git a/src/WiFiConfig.cpp b/src/WiFiConfig.cpp index 84b0e47..8f4ec88 100644 --- a/src/WiFiConfig.cpp +++ b/src/WiFiConfig.cpp @@ -1,5 +1,8 @@ /* - * V6.3.1- 1.9.2019 - Odstraneni HTML5 validatoru - delaly akorat problemy anedala se ulozit konfigurace i kdyz byly polozky skryty + * v6.3.2- 4.10.2019 - Informace o aplikaci a jeji verzi do footeru, zrychlen restart z 10 na 5 sekund, vylepsena stranka pro reset + * verze pro ESP32 zobrazuje neco malo informaci o stavu pripojeni a duvodu vstupu do WifiConfig + * + * V6.3.1- 1.9.2019 - Odstraneni HTML5 validatoru - delaly akorat problemy a nedala se ulozit konfigurace i kdyz byly polozky skryty * * V6.3 - 12.8.2019 - IP adresa Captive portalu je zmenena na 172.217.28.1 kvuli funkcnosti na Android zarizenich (viz. zmena zde https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino) * ladici vypis pri zachyceni presmerovani v Captive portalu. diff --git a/src/WiFiConfig.h b/src/WiFiConfig.h index 4d579b8..0dd0872 100644 --- 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-19 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 diff --git a/src/embHTML.h b/src/embHTML.h index 77f5ab6..a997198 100644 --- a/src/embHTML.h +++ b/src/embHTML.h @@ -81,10 +81,21 @@ static const char PAGE_PARAM[] PROGMEM = R"=====( static const char PAGE_END[] PROGMEM = R"=====(
- +)=====" +#if defined APP_NAME && defined APP_VERSION +R"=====(
)=====" +APP_NAME +" v" +APP_VERSION +R"=====(
+)=====" +#else +R"=====(
WiFiConfig by xPablo
)=====" +#endif +R"=====( )====="; /* -
WiFiConfig by xPablo
+
WiFiConfig by xPablo
*/ // Nenalezeno zadne SSID static const char PAGE_NO_SSID[] PROGMEM = R"=====( @@ -93,13 +104,13 @@ static const char PAGE_NO_SSID[] PROGMEM = R"=====( // Konfigurace ulozena - restartuji... static const char PAGE_SAVED[] PROGMEM = R"=====( - + xPablo Setup - Konfigurace uložena Uloženo do EEPROM...
-Restart za 10 sekund. +Restart za 5 sekund. )====="; @@ -113,11 +124,29 @@ static const char PAGE_CAPTIVEPORTALCATCH[] PROGMEM = R"=====(



)====="; -// 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"=====( - + +)=====" +#if defined APP_NAME && defined APP_VERSION +R"=====(
)=====" +APP_NAME +" v" +APP_VERSION +R"=====(
+)=====" +#else +R"=====(
WiFiConfig by xPablo
)=====" +#endif +R"=====( )====="; static const char PAGE_RESTART[] PROGMEM = R"=====( - Restartuji... + + +xPablo Setup - Restart + + +Restartuji... + )=====";