diff --git a/src/CHANGES.md b/src/CHANGES.md index 7ee05094..089e37b5 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,8 @@ # Changelog +## 0.5.55 +* fixed static IP save + ## 0.5.54 * changed sunrise / sunset calculation, angle is now `-3.5` instead of original `-0.83` * improved scheduler (removed -1 from `reload`) #483 diff --git a/src/defines.h b/src/defines.h index cde85689..63456ab4 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 54 +#define VERSION_PATCH 55 //------------------------------------- typedef struct { diff --git a/src/utils/helper.cpp b/src/utils/helper.cpp index bc027bae..6854a7e8 100644 --- a/src/utils/helper.cpp +++ b/src/utils/helper.cpp @@ -7,16 +7,16 @@ namespace ah { void ip2Arr(uint8_t ip[], const char *ipStr) { + char tmp[16]; memset(ip, 0, 4); - char *tmp = new char[strlen(ipStr)+1]; - snprintf(tmp, strlen(ipStr), ipStr); + memset(tmp, 0, 16); + snprintf(tmp, 16, ipStr); char *p = strtok(tmp, "."); uint8_t i = 0; while(NULL != p) { ip[i++] = atoi(p); p = strtok(NULL, "."); } - delete[] tmp; } // note: char *str needs to be at least 16 bytes long diff --git a/src/web/html/serial.html b/src/web/html/serial.html index 2064da38..ea57f73f 100644 --- a/src/web/html/serial.html +++ b/src/web/html/serial.html @@ -56,7 +56,6 @@ -

Ctrl result: n/a

@@ -186,14 +185,6 @@ getAjax("/api/ctrl", ctrlCb, "POST", JSON.stringify(obj)); }); - document.getElementById("alarminfo").addEventListener("click", function() { - var obj = new Object(); - obj.id = get_selected_iv(); - obj.cmd = "dev"; - obj.val = 0x11; - getAjax("/api/ctrl", ctrlCb, "POST", JSON.stringify(obj)); - }); - document.getElementById("sendpwrlim").addEventListener("click", function() { var val = parseInt(document.getElementsByName('pwrlimval')[0].value); var cmd = document.getElementsByName('pwrlimctrl')[0].value;