6 Commits

3 changed files with 424 additions and 521 deletions

File diff suppressed because it is too large Load Diff

View File

@ -48,7 +48,6 @@ typedef struct
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
char devname[32 + 2]; // jmeno zarizeni (pro NBNS plati jen 16 znaku)
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
@ -143,8 +142,6 @@ uint32_t getEEPROMuint32(int start);
*/ */
void setEEPROMuint32(int start, uint32_t val); void setEEPROMuint32(int start, uint32_t val);
extern char WiFiDeviceName[]; // jmeno zarizeni, pouzivane i pro DHCP
class WiFiConfigUsrParameter class WiFiConfigUsrParameter
{ {
public: public:

View File

@ -37,7 +37,6 @@ static const char SSID_ITEM[] PROGMEM = R"=====(
/* Zacatek formulare pro vyplneni /* Zacatek formulare pro vyplneni
{s} - SSID {s} - SSID
{p} - password {p} - password
{n} - Netbios name
{a} - AP mode (checkbox) {a} - AP mode (checkbox)
{ch}- cislo kanalu AP {ch}- cislo kanalu AP
{c} - staticka IP konfigurace (checkbox) {c} - staticka IP konfigurace (checkbox)
@ -48,9 +47,8 @@ static const char SSID_ITEM[] PROGMEM = R"=====(
*/ */
static const char PAGE_INDEX2[] PROGMEM = R"=====( static const char PAGE_INDEX2[] PROGMEM = R"=====(
<form method='post' action='s'> <form method='post' action='s'>
<label>SSID<br><input id='_s' name='_s' maxlength=32 required {s}></label><br> <label>SSID<br><input id='_s' name='_s' maxlength=32 required placeholder='SSID' {s}></label><br>
<label>Heslo<br><input id='_p' name='_p' maxlength=64 {p} type='password'></label><br> <label>Heslo<br><input id='_p' name='_p' maxlength=64 {p} type='password' placeholder='heslo'></label><br>
<label>Jméno zařízení<br><input name='_n' maxlength=32 pattern='^[a-zA-Z][a-zA-Z0-9-_\\.]{1,32}$' title='Jméno dle NetBios konvence (max. 16 znaků písmena, čísla a znaky "_.")' {n}></label><br>
<div> <div>
<label><input id='_a' name='_a' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hAP();' {a}>Režim AP</label> <label><input id='_a' name='_a' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hAP();' {a}>Režim AP</label>
<div id="apconfig"> <div id="apconfig">
@ -58,7 +56,7 @@ static const char PAGE_INDEX2[] PROGMEM = R"=====(
</div> </div>
</div> </div>
<div> <div>
<label><input id='_st' name='_st' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hSC();' {c}>Staticka IP konfigurace</label> <label><input id='_st' name='_st' type='checkbox' style="width: 10%; float: left; margin-top: 5px;" onclick='hSC();' {c}>Statická IP konfigurace</label>
<div id="staticip"> <div id="staticip">
<label>IP adresa<br><input type="text" name="_i" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{i}'></label><br> <label>IP adresa<br><input type="text" name="_i" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{i}'></label><br>
<label>Síťová maska<br><input type="text" name="_m" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{m}'></label><br> <label>Síťová maska<br><input type="text" name="_m" pattern='((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$' title='ip adresa ve formatu <cislo>.<cislo>.<cislo>.<cislo>' value='{m}'></label><br>