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

Opravy pro preklad.

Browse Source
This commit is contained in:
Pavel Brychta
2018-07-19 12:19:54 +02:00
parent 242238a1f0
commit a742f624fb
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WiFiConfig.cpp
View File

@@ -167,11 +167,11 @@ void setEEPROMuint32(unsigned int start, uint32_t val)
String getEEPROMString(unsigned int start, size_t maxlen) String getEEPROMString(unsigned int start, size_t maxlen)
{ {
uint8_t mac[WL_MAC_ADDR_LENGTH]; uint8_t mac[WL_MAC_ADDR_LENGTH];
unsignd int enciphidx = 0; unsigned int enciphidx = 0;
String string = ""; String string = "";
WiFi.softAPmacAddress(mac); WiFi.softAPmacAddress(mac);
for (unsigned int i = start; i < + start + len; ++i) for (unsigned int i = start; i < + start + maxlen; ++i)
{ {
uint8_t b = EEPROM.read(i); uint8_t b = EEPROM.read(i);
@@ -186,14 +186,14 @@ String getEEPROMString(unsigned int start, size_t maxlen)
return string; return string;
} }
void setEEPROMString(unsigned int start, size_t len, String &string) void setEEPROMString(unsigned int start, size_t maxlen, String &string)
{ {
uint8_t mac[WL_MAC_ADDR_LENGTH]; uint8_t mac[WL_MAC_ADDR_LENGTH];
unsignd int enciphidx = 0; unsigned int enciphidx = 0;
unsigned int si = 0; unsigned int si = 0;
WiFi.softAPmacAddress(mac); WiFi.softAPmacAddress(mac);
for (unsigned int i = start; i < start + len; ++i) for (unsigned int i = start; i < start + maxlen; ++i)
{ {
char c; char c;
@@ -213,7 +213,7 @@ void setEEPROMString(unsigned int start, size_t len, String &string)
} }
} }
WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, int length, storeparam_cb cb) WiFiConfigUsrParameter::WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, unsigned int length, storeparam_cb cb)
{ {
_next = NULL; _next = NULL;
_cb = cb; _cb = cb;
@@ -300,12 +300,12 @@ void WiFiConfig::_handleNotFound(void)
if (server->uri().endsWith(String(F("favicon.ico")))) if (server->uri().endsWith(String(F("favicon.ico"))))
{ {
server->send_P(404, FPSTR(TEXTPLAIN), PSTR("Err")); server->send_P(404, TEXTPLAIN, PSTR("Err"));
} }
else else
{ {
server->sendHeader(F("Location"), String(F("http://")) + server->client().localIP().toString() + String(F("/index.htm")), true); server->sendHeader(F("Location"), String(F("http://")) + server->client().localIP().toString() + String(F("/index.htm")), true);
server->send_P(302, FPSTR(TEXTPLAIN), PSTR("Redirect")); server->send_P(302, TEXTPLAIN, PSTR("Redirect"));
} }
} }
@@ -319,7 +319,7 @@ void WiFiConfig::_handleReset(void)
ESP.restart(); ESP.restart();
}); });
server->send_P(200, FPSTR(TEXTHTML), FPSTR(PAGE_RESTART)); server->send_P(200, TEXTHTML, PAGE_RESTART);
} }
void WiFiConfig::_handleInfo(void) void WiFiConfig::_handleInfo(void)
@@ -579,7 +579,7 @@ void WiFiConfig::_handleSetAP(void)
} }
EEPROM.commit(); // skutecne ulozime data EEPROM.commit(); // skutecne ulozime data
} }
server->send_P(200, FPSTR(TEXTHTML), FPSTR(PAGE_SAVED)); server->send_P(200, TEXTHTML, PAGE_SAVED);
delay(2000); // cekame na odeslani dat delay(2000); // cekame na odeslani dat
// nakonfigurujeme ESP dle nove nastavenych parametru // nakonfigurujeme ESP dle nove nastavenych parametru
WiFi.disconnect(); // vsechno odpojime WiFi.disconnect(); // vsechno odpojime

6
src/WiFiConfig.h
View File

@@ -94,7 +94,7 @@ typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzi
* \param [in] len Delka retezce * \param [in] len Delka retezce
* \return Vycteny retezec * \return Vycteny retezec
*/ */
String getEEPROMString(unsigned int start, size_t len); String getEEPROMString(unsigned int start, size_t maxlen);
/** /**
* \brief Ulozeni retezce do EEPROM * \brief Ulozeni retezce do EEPROM
@@ -103,7 +103,7 @@ String getEEPROMString(unsigned int start, size_t len);
* \param [in] len Maximalni delka ulozeneho retezce * \param [in] len Maximalni delka ulozeneho retezce
* \param [in] string Ukladany retezec * \param [in] string Ukladany retezec
*/ */
void setEEPROMString(unsigned int start, size_t len, String string); void setEEPROMString(unsigned int start, size_t maxlen, String &string);
/** /**
* \brief Ziskani nasi ip adresy * \brief Ziskani nasi ip adresy
@@ -144,7 +144,7 @@ extern char WiFiDeviceName[]; // jmeno zarizeni, pouzivane i pro DHCP
class WiFiConfigUsrParameter class WiFiConfigUsrParameter
{ {
public: public:
WiFiConfigUsrParameter(const char *id, const char *label, const char *defaultValue, 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();