diff --git a/WifiControlSensor/EEPROM.ino b/WifiControlSensor/EEPROM.ino index 66c5325..5908fc1 100644 --- a/WifiControlSensor/EEPROM.ino +++ b/WifiControlSensor/EEPROM.ino @@ -8,8 +8,8 @@ int EepromSaveConfig(uint8_t bootMode, String ssid, String password, String host, String mqttServer, String mqttUser, String mqttPasswd, - int mqttPort, int ip_config, String ip, String gw, - String mask, String dns, String dns2) { + int mqttPort, int ip_config, uint32_t ip, uint32_t gw, + uint32_t mask, uint32_t dns, uint32_t dns2) { String eeprom; eeprom = String(bootMode) + ";" + ssid + ";" + password + ";" @@ -57,8 +57,8 @@ void readConfElement(char** element, int &i) { void EepromReadConfig(uint8_t &bootMode, char **ssid, char **password, char **host, char **mqttServer, char **mqttUser, char **mqttPasswd, - int &mqttPort, int &ip_config, char **ip, char **gw, - char **mask, char **dns, char**dns2) { + int &mqttPort, int &ip_config, uint32_t &ip, uint32_t &gw, + uint32_t &mask, uint32_t &dns, uint32_t &dns2) { int i = 2; @@ -85,9 +85,15 @@ void EepromReadConfig(uint8_t &bootMode, char **ssid, char **password, char **ho mqttPort = atoi(tmpString); readConfElement(&tmpString, i); ip_config = atoi(tmpString); - readConfElement(ip, i); - readConfElement(gw, i); - readConfElement(mask, i); - readConfElement(dns, i); - readConfElement(dns2, i); + readConfElement(&tmpString, i); + ip = atoi(tmpString); + readConfElement(&tmpString, i); + gw = atoi(tmpString); + readConfElement(&tmpString, i); + mask = atoi(tmpString); + readConfElement(&tmpString, i); + dns = atoi(tmpString); + readConfElement(&tmpString, i); + dns2 = atoi(tmpString); + } diff --git a/WifiControlSensor/WebServer.ino b/WifiControlSensor/WebServer.ino index 1b05261..9db8dfe 100644 --- a/WifiControlSensor/WebServer.ino +++ b/WifiControlSensor/WebServer.ino @@ -33,6 +33,10 @@ void WebHandleRoot() { ); } +void WebSendError(String error) { + server.send(500, "text/plain", error); +} + void WebHandleSetup() { uint8_t mode; char *confSsid = ""; @@ -43,13 +47,13 @@ void WebHandleSetup() { char *mqttPasswd = ""; int mqttPort = 1883; int ip_config = 0; - char *ip = "192.168.0.123"; - char *gw = "192.168.0.1"; - char *mask = "255.255.255.0"; - char *dns = "8.8.8.8"; - char *dns2 = ""; + uint32_t ip; + uint32_t gw; + uint32_t mask; + uint32_t dns; + uint32_t dns2; - EepromReadConfig(mode, &confSsid, &confPassword, &confHost, &mqttServer, &mqttUser, &mqttPasswd, mqttPort, ip_config, &ip, &gw, &mask, &dns, &dns2); + EepromReadConfig(mode, &confSsid, &confPassword, &confHost, &mqttServer, &mqttUser, &mqttPasswd, mqttPort, ip_config, ip, gw, mask, dns, dns2); server.send(200, "text/html", "