diff options
| -rw-r--r-- | HouseControl.ino | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/HouseControl.ino b/HouseControl.ino index 9a89275..63e1c76 100644 --- a/HouseControl.ino +++ b/HouseControl.ino @@ -133,17 +133,17 @@ WebServer httpServer("", 80); char* mac_to_str(void *buf, const uint8_t* macAddr) { - sprintf((char*)buf, "%02X:%02X:%02X:%02X:%02X:%02X", macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], macAddr[5]); + sprintf_P((char*)buf, PSTR("%02X:%02X:%02X:%02X:%02X:%02X"), macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], macAddr[5]); return (char*)buf; } char* ip_to_str(void *buf, const uint8_t* ipAddr) { - sprintf((char*)buf, "%d.%d.%d.%d", ipAddr[0], ipAddr[1], ipAddr[2], ipAddr[3]); + sprintf_P((char*)buf, PSTR("%d.%d.%d.%d"), ipAddr[0], ipAddr[1], ipAddr[2], ipAddr[3]); return (char*)buf; } char* time_to_str(void *buf, time_t t) { - sprintf((char*)buf, "%d/%d/%d %02d:%02d:%02d", day(t), month(t), year(t), hour(t), minute(t), second(t)); + sprintf_P((char*)buf, PSTR("%d/%d/%d %02d:%02d:%02d"), day(t), month(t), year(t), hour(t), minute(t), second(t)); return (char*)buf; } @@ -268,21 +268,21 @@ void jsonHandler(WebServer &server, WebServer::ConnectionType type, char *url_ta if (type == WebServer::GET) { /* store the HTML in program memory using the P macro */ - server.print("{\"fdo\":\""); + server.print(F("{\"fdo\":\"")); server.print(((frontDoor.open )?"open" :"state")); - server.print("\",\"fdc\":\""); + server.print(F("\",\"fdc\":\"")); server.print(((frontDoor.closed )?"closed":"state")); - server.print("\",\"fdu\":\""); + server.print(F("\",\"fdu\":\"")); server.print(((frontDoor.controlActive)?"unlocked":"locked")); - server.print("\",\"gd1o\":\""); + server.print(F("\",\"gd1o\":\"")); server.print(((garageDoor1.open )?"open" :"state")); - server.print("\",\"gd1c\":\""); + server.print(F("\",\"gd1c\":\"")); server.print(((garageDoor1.closed)?"closed":"state")); - server.print("\",\"gd2o\":\""); + server.print(F("\",\"gd2o\":\"")); server.print(((garageDoor2.open )?"open" :"state")); - server.print("\",\"gd2c\":\""); + server.print(F("\",\"gd2c\":\"")); server.print(((garageDoor2.closed)?"closed":"state")); - server.print("\"}"); + server.print(F("\"}")); } } @@ -327,27 +327,27 @@ void configGetHandler(WebServer &server, WebServer::ConnectionType type, char *u /* we don't output the body for a HEAD request */ if (type == WebServer::GET) { - sprintf((char*)buf1, "{\"info\":{\"version\":%d,\"time\":\"", config.configVersion); + sprintf_P((char*)buf1, PSTR("{\"info\":{\"version\":%d,\"time\":\""), config.configVersion); server.print((char*)buf1); server.print(time_to_str(buf2, time)); - server.print("\",\"lastntp\":\""); + server.print(F("\",\"lastntp\":\"")); server.print(time_to_str(buf2, lastNTPtime)); - server.print("\"},\"settings\":{\"mac\":\""); + server.print(F("\"},\"settings\":{\"mac\":\"")); server.print(mac_to_str(buf2, config.mac)); - server.print("\",\"def_ip\":\""); + server.print(F("\",\"def_ip\":\"")); server.print(ip_to_str(buf2, config.def_ip)); - server.print("\",\"def_nm\":\""); + server.print(F("\",\"def_nm\":\"")); server.print(ip_to_str(buf2, config.def_netmask)); - server.print("\",\"def_gw\":\""); + server.print(F("\",\"def_gw\":\"")); server.print(ip_to_str(buf2, config.def_gateway)); - server.print("\",\"ntpserver\":\""); + server.print(F("\",\"ntpserver\":\"")); server.print(ip_to_str(buf2, config.ntpServer)); sprintf((char*)buf1, "\",\"utcoffset\":\"%+05d\",\"stathost\":\"", config.UTC_offset); @@ -358,7 +358,7 @@ void configGetHandler(WebServer &server, WebServer::ConnectionType type, char *u sprintf((char*)buf1, "\",\"statport\":%u,\"fd_utime\":%u,\"gd_gtime\":%u,", config.notifyPort, config.frontdoor_holdtime, config.garagedoor_nightgracetime); server.print((char*)buf1); - sprintf((char*)buf1, "\"dawn\":%u,\"dusk\":%u}}", config.dawn, config.dusk); + sprintf_P((char*)buf1, PSTR("\"dawn\":%u,\"dusk\":%u}}"), config.dawn, config.dusk); server.print((char*)buf1); } @@ -369,32 +369,32 @@ void configSetHandler(WebServer &server, WebServer::ConnectionType type, char *u server.httpSuccess(); while (server.readPOSTparam((char*)buf2, BUF2_SIZE, (char*)buf1, BUF1_SIZE)) { if ((strcmp((const char*)buf2, "mac") == 0)) - if (!str_to_mac(buf1, config.mac)) { server.print("Invalid MAC Address"); return; } + if (!str_to_mac(buf1, config.mac)) { server.print(F("Invalid MAC Address")); return; } if ((strcmp((const char*)buf2, "def_ip") == 0)) - if (!str_to_ip(buf1, config.def_ip)) { server.print("Invalid IP Address"); return; } + if (!str_to_ip(buf1, config.def_ip)) { server.print(F("Invalid IP Address")); return; } if ((strcmp((const char*)buf2, "def_nm") == 0)) - if (!str_to_ip(buf1, config.def_netmask)) { server.print("Invalid Netmask"); return; } + if (!str_to_ip(buf1, config.def_netmask)) { server.print(F("Invalid Netmask")); return; } if ((strcmp((const char*)buf2, "def_gw") == 0)) - if (!str_to_ip(buf1, config.def_gateway)) { server.print("Invalid Gateway"); return; } + if (!str_to_ip(buf1, config.def_gateway)) { server.print(F("Invalid Gateway")); return; } if ((strcmp((const char*)buf2, "ntpserver") == 0)) - if (!str_to_ip(buf1, config.ntpServer)) { server.print("Invalid NTP Server"); return; } + if (!str_to_ip(buf1, config.ntpserver)) { server.print(F("Invalid NTP Server")); return; } if ((strcmp((const char*)buf2, "utcoffset") == 0)) - if (!verify_utcoffset(buf1, &config.UTC_offset)) { server.print("Invalid UTC offset"); return; } + if (!verify_utcoffset(buf1, &config.utcoffset)) { server.print(F("Invalid UTC offset")); return; } if ((strcmp((const char*)buf2, "stathost") == 0)) - if (!str_to_ip(buf1, config.notifyHost)) { server.print("Invalid Status target"); return; } + if (!str_to_ip(buf1, config.notifyhost)) { server.print(F("Invalid Status target host")); return; } server.print((char*)buf2); server.print(" = '"); server.print((char*)buf1); server.print("'<br />\n"); } - server.print("Settings Saved Successfully"); + server.print(F("Settings Saved Successfully")); return; } |