pablo2048/WiFiConfig
1
0
Fork 0
Code Issues 4 Pull Requests Releases 11 Wiki Activity

Compare commits

base: pablo2048:6.3.2
Branches Tags
pablo2048:master pablo2048:feature/APEnable
pablo2048:v7.0.0 pablo2048:6.4.0 pablo2048:6.3.4 pablo2048:6.3.2 pablo2048:v6.3.1 pablo2048:v6.0 pablo2048:v5.9 pablo2048:v5.8 pablo2048:v5.7 pablo2048:v5.5 pablo2048:v5.4
..
compare: pablo2048:6.4.0
Branches Tags
pablo2048:feature/APEnable pablo2048:master
pablo2048:v7.0.0 pablo2048:6.4.0 pablo2048:6.3.4 pablo2048:6.3.2 pablo2048:v6.3.1 pablo2048:v6.0 pablo2048:v5.9 pablo2048:v5.8 pablo2048:v5.7 pablo2048:v5.5 pablo2048:v5.4

18 Commits
6.3.2 ... 6.4.0

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
6 changed files with 893 additions and 757 deletions
Expand all files Collapse all files

191
examples/WiFiConfig_simple_test/WiFiConfig_simple_test.ino
View File

@ -1,16 +1,21 @@
#include <ESP8266WiFi.h> #if defined(ARDUINO_ARCH_ESP8266)
#include <ESP8266WebServer.h> # include <ESP8266WiFi.h>
# include <ESP8266WebServer.h>
# include <ESP8266NetBIOS.h>
#else
# include <WiFi.h>
# include <WebServer.h>
# include <NetBIOS.h>
#endif
#include <ArduinoOTA.h> #include <ArduinoOTA.h>
#include <EEPROM.h> #include <EEPROM.h>
#include <ESP8266NetBIOS.h>
#include <WiFiConfig.h> #include <WiFiConfig.h>
#include <encipheredEEPROMStrings.h> #include <encipheredEEPROMStrings.h>
#define EEPROM_MAGIC 0xdeadbeef
// Plati pro desticku Witty s modulem ESP-12E // Plati pro desticku Witty s modulem ESP-12E
#define PIN_FORCE_CONFIG 4 #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) {}
#define DEBUG_OUT(a) Serial.print(a) #define DEBUG_OUT(a) Serial.print(a)
@ -18,9 +23,9 @@
// Definice obsazeni EEPROM // Definice obsazeni EEPROM
#define elementSize(type, element) sizeof(((type *)0)->element) #define elementSize(type, element) sizeof(((type *)0)->element)
#define countof(a) (sizeof(a) / sizeof(a[0])) #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) char devname[32 + 2]; // jmeno zarizeni (pro NBNS plati jen 16 znaku)
} eepromconfig_t; } 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_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) #define EEPROM_CONFIG_ORIGIN (0)
char WiFiDeviceName[elementSize(eepromconfig_t, devname)]; // misto pro jmeno zarizeni (dodane do DNS, DHCP NBNS apod...) 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 ESP8266WebServer wwwserver(80); // webovy server
#else
WebServer wwwserver(80); // webovy server
#endif
String content; String content;
static void handleRoot(void) static void handleRoot(void)
{ {
content = F("<!DOCTYPE HTML>\n<html>Hello world from ESP8266"); content = F("<!DOCTYPE HTML>\n<html>Hello world from ESP8266");
content += F("<p>"); content += F("<p>");
content += F("</html>"); content += F("</html>");
wwwserver.send(200, "text/html", content); wwwserver.send(200, "text/html", content);
} }
void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state) void ICACHE_FLASH_ATTR wcb(wificonfigstate_t state)
{ {
switch (state) switch (state) {
{
case WCS_CONNECTSTART: case WCS_CONNECTSTART:
DEBUG_OUT(F("Starting connect...\r\n")); DEBUG_OUT(F("Starting connect...\r\n"));
break; break;
case WCS_CONNECTING: case WCS_CONNECTING:
break; break;
case WCS_CONNECTED: case WCS_CONNECTED:
DEBUG_OUT(F("Connected.\r\n")); DEBUG_OUT(F("Connected.\r\n"));
break; break;
case WCS_CONFIGSTART: case WCS_CONFIGSTART:
DEBUG_OUT(F("Starting config...\r\n")); DEBUG_OUT(F("Starting config...\r\n"));
break; break;
case WCS_CONFIGWAIT: case WCS_CONFIGWAIT:
break; break;
}
case WCS_CONFIGTIMEOUT:
DEBUG_OUT(F("Config timeout...\r\n"));
break;
}
} }
void ICACHE_FLASH_ATTR saveDevname(const char *param) 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() void ICACHE_FLASH_ATTR setup()
{ {
WiFiConfig wifi; // konfigurace ESP modulu WiFiConfig wifi; // konfigurace ESP modulu
WiFiConfigUsrParameter devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname); WiFiConfigUsrParameter devname("devname", "Jméno zařízení", (const char *)WiFiDeviceName, 32, saveDevname);
EEPROM.begin(EEPROM_SIZE); // 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);
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 uint32_t magic;
ESP.restart();
wwwserver.on("/", handleRoot); EEPROM.get(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
wwwserver.begin(); // startujeme webovy server if (EEPROM_MAGIC != magic) {
// EEPROM ma spatny obsah
if (strlen(WiFiDeviceName) > 0) for (unsigned int i = 0; i < EEPROM_SIZE; i++)
{ EEPROM.write(i, 0);
NBNS.begin(WiFiDeviceName); magic = EEPROM_MAGIC;
ArduinoOTA.setHostname(WiFiDeviceName); EEPROM.put(EEPROM_CONFIG_ORIGIN + offsetof(eepromconfig_t, magic), magic);
} EEPROM.commit();
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(); 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() void loop()
{ {
wwwserver.handleClient(); // osetrujeme praci serveru wwwserver.handleClient(); // osetrujeme praci serveru
ArduinoOTA.handle(); ArduinoOTA.handle();
} }

4
library.json
View File

@ -10,9 +10,9 @@
"repository": "repository":
{ {
"type": "git", "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", "license": "MIT",
"frameworks": "arduino", "frameworks": "arduino",
"platforms": ["espressif8266", "espressif32"], "platforms": ["espressif8266", "espressif32"],

6
library.properties
View File

@ -1,9 +1,9 @@
name=WiFiConfig name=WiFiConfig
version=6.3.1 version=6.4.0
author=Pavel Brychta author=Pavel Brychta
maintainer=Pavel Brychta <Pablo@xpablo.cz> maintainer=Pavel Brychta <pablo@xpablo.cz>
sentence=Enables seamless module configuration. 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. 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 category=Other
url=http://www.xpablo.cz url=https://www.xpablo.cz
architectures=esp8266,esp32 architectures=esp8266,esp32

1234
src/WiFiConfig.cpp
View File

File diff suppressed because it is too large Load Diff

132
src/WiFiConfig.h
View File

@ -2,7 +2,7 @@
* @file WiFiConfig.h * @file WiFiConfig.h
* @author Pavel Brychta, http://www.xpablo.cz * @author Pavel Brychta, http://www.xpablo.cz
* *
* Copyright (c) 2015-19 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -31,9 +31,9 @@
#define __WiFiConfig_h__ #define __WiFiConfig_h__
#if defined(ESP8266) #if defined(ESP8266)
#include <ESP8266WiFi.h> # include <ESP8266WiFi.h>
#else #else
#include <WiFi.h> # include <WiFi.h>
#endif #endif
#include <memory> #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 #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 // Struktura konfigurace, ulozena v EEPROM
typedef struct typedef struct {
{ uint8_t mode; // rezim prace AP/STA
uint8_t mode; // rezim prace AP/STA uint8_t ip; // konfigurace ip (staticka/DHCP)
uint8_t ip; // konfigurace ip (staticka/DHCP) char ssid[32 + 2]; // SSID site
char ssid[32 + 2]; // SSID site char pass[64 + 2]; // heslo
char pass[64 + 2]; // heslo uint32_t ipaddr; // ip adresa v pripade staticke konfigurace
uint32_t ipaddr; // ip adresa v pripade staticke konfigurace uint32_t netmask; // sitova maska v pripade staticke konfigurace
uint32_t netmask; // sitova maska v pripade staticke konfigurace uint32_t gateway; // sitova brana v pripade staticke konfigurace
uint32_t gateway; // sitova brana v pripade staticke konfigurace uint32_t dns; // ip adresa DNS serveru 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)
uint8_t apchannel; // kanal, na kterem pracuje AP (pokud je zapnuty rezim AP)
} wificonfigarea_t; } wificonfigarea_t;
// Parametr, predany uzivatelske callback funkci, urceny pro aplikacni vizualizaci stavu konfigurace a pripojeni // 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_CONNECTSTART = 0, // zacatek pokusu o pripojeni k ulozene konfiguraci WCS_CONNECTING = 1, // probiha pokus o pripojeni
WCS_CONNECTING = 1, // probiha pokus o pripojeni WCS_CONNECTED = 2, // pripojeni bylo uspesne/byl spusteny AP
WCS_CONNECTED = 2, // pripojeni bylo uspesne WCS_CONFIGSTART = 3, // zacatek startu konfiguracniho AP
WCS_CONFIGSTART = 3, // zacatek startu konfiguracniho AP WCS_CONFIGWAIT = 4, // cekame na nastaveni konfigurace pres web
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(...)
WCS_CONFIGTIMEOUT = 5, // doslo k vyprseni timeoutu konfigurace, budeme se vracet s False jako vysledek z .begin(...) } wificonfigstate_t;
}wificonfigstate_t;
// Navratovy parametr z volani begin() - udava, jak se podarilo WiFiConfig modulu pripojit k AP // 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_OK = 0, // wifi pripojena/AP nastartovane (dle parametru v EEPROM) WCR_TIMEOUT = 1, // wifi neni pripojena a vyprsel zadany timeout
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)
WCR_CONFIGAP_NOT_STARTED = 2, // wifi neni pripojena a spusteni konfiguracniho AP bylo zakazane parametrem timeout (WC_DONT_RUN_CONFIGAP) } wificonfigresult_t;
}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 (*wificonfig_cb)(wificonfigstate_t state); // definice callbacku
typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzivatelskeho parametru typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzivatelskeho parametru
#ifndef WIFI_STA_CONNECT_TIMEOUT #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 #endif
#ifndef SETUP_SSID #ifndef SETUP_SSID
#define SETUP_SSID "ESPPBSetup_?" # define SETUP_SSID "ESPPBSetup_?"
#endif #endif
#ifndef SETUP_CHANNEL #ifndef SETUP_CHANNEL
#define SETUP_CHANNEL 3 # define SETUP_CHANNEL 3
#endif #endif
/** /**
@ -144,24 +154,24 @@ void setEEPROMuint32(int start, uint32_t val);
class WiFiConfigUsrParameter class WiFiConfigUsrParameter
{ {
public: public:
WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, unsigned 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 *getID();
const char *getValue(); const char *getValue();
const char *getLabel(); const char *getLabel();
int getValueLength(); int getValueLength();
void setNext(WiFiConfigUsrParameter *n); void setNext(WiFiConfigUsrParameter *n);
WiFiConfigUsrParameter *getNext(); WiFiConfigUsrParameter *getNext();
void setNewValue(const char *newval); void setNewValue(const char *newval);
private: private:
const char *_id; const char *_id;
const char *_label; const char *_label;
char *_value; char *_value;
int _length; int _length;
storeparam_cb _cb; storeparam_cb _cb;
WiFiConfigUsrParameter *_next; WiFiConfigUsrParameter *_next;
friend class WiFiConfig; friend class WiFiConfig;
}; };
@ -169,26 +179,30 @@ class WiFiConfigUsrParameter
class WiFiConfig class WiFiConfig
{ {
public: public:
WiFiConfig(): _params(NULL), _timeout(0) {} WiFiConfig(): _params(NULL), _timeout(0) {}
wificonfigresult_t begin(int configarea, int forceConfigure, wificonfig_cb cb); wificonfigresult_t begin(int configarea, int forceConfigure, wificonfig_cb cb);
wificonfigresult_t begin(int configarea, int 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: 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);
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 private:
int _timeout; // timeout pri cekani na konfiguraci void _prepareWifi(void);
uint32_t _time; // hodnota, po ktere bude ESP restartovano (pokud je _timeout != 0) wificonfigresult_t _setupAP(wificonfig_cb cb);
uint8_t _status; // stav pripojeni - je pouzity pro signalizaci duvodu, proc se nepripoji k AP 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 #endif

83
src/embHTML.h
View File

@ -1,10 +1,18 @@
// HTML data // 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 TEXTHTML[] PROGMEM = "text/html";
static const char TEXTPLAIN[] PROGMEM = "text/plain"; static const char TEXTPLAIN[] PROGMEM = "text/plain";
static const char PAGE_INDEX1[] PROGMEM = R"=====( 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"> <!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> <style>
.c{text-align: center;} .c{text-align: center;}
div,input{padding:5px;font-size:1em;} 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 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';}} function hSC(){if (document.getElementById('_st').checked){document.getElementById('staticip').style.display = 'block';}else{document.getElementById('staticip').style.display = 'none';}}
</script> </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 /* Polozky nalezenych SSID
@ -119,10 +127,22 @@ 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;} <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} .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;} .red { background-color: #ff0000;}
.magenta { background-color: #ff00ff;}
</style> </style>
</head><body><div style='text-align:left;display:inline-block;min-width:260px;'> </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 2. cast muzeme doplnit dodatecne informace) // druha cast (mezi 1. a 2. cast muzeme doplnit dodatecne informace)
static const char PAGE_CAPTIVEPORTALCATCH2[] PROGMEM = R"=====( static const char PAGE_CAPTIVEPORTALCATCH2[] PROGMEM = R"=====(
@ -150,3 +170,58 @@ static const char PAGE_RESTART[] PROGMEM = R"=====(
Restartuji... Restartuji...
</body></html> </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>
)=====";