diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index 1cbe3d88..325c4eae 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 23 +#define VERSION_PATCH 24 //------------------------------------- diff --git a/tools/esp8266/html/api.js b/tools/esp8266/html/api.js index eb2791ee..37fa55c7 100644 --- a/tools/esp8266/html/api.js +++ b/tools/esp8266/html/api.js @@ -1,3 +1,22 @@ +/** + * GENERIC FUNCTIONS + */ + +function topnav() { + toggle("topnav"); +} + +function parseMenu(obj) { + var e = document.getElementById("topnav"); + e.innerHTML = ""; + for(var i = 0; i < obj["name"].length; i ++) { + if(obj["name"][i] == "-") + e.appendChild(span("", ["seperator"])); + else + e.appendChild(link(obj["link"][i], obj["name"][i], obj["trgt"][i])); + } +} + function toggle(id, hide) { var elm = document.getElementById(id); if(hide) { @@ -36,6 +55,10 @@ function getAjax(url, ptr, method="GET", json=null) { } } +/** + * CREATE DOM FUNCTIONS + */ + function des(val) { e = document.createElement('p'); e.classList.add("subdes"); diff --git a/tools/esp8266/html/index.html b/tools/esp8266/html/index.html index 0576494c..74bc7c97 100644 --- a/tools/esp8266/html/index.html +++ b/tools/esp8266/html/index.html @@ -85,20 +85,6 @@ getAjax("/api/setup", apiCb, "POST", JSON.stringify(obj)); } - function topnav() { - toggle("topnav"); - } - - function parseMenu(obj) { - if(true == exeOnce) { - var e = document.getElementById("topnav"); - e.innerHTML = ""; - for(var i = 0; i < obj["name"].length; i ++) { - e.appendChild(link(obj["link"][i], obj["name"][i])); - } - } - } - function parseSys(obj) { // Disclaimer //if(obj["disclaimer"] == false) sessionStorage.setItem("gDisclaimer", promptFunction()); @@ -187,7 +173,8 @@ function parse(obj) { if(null != obj) { - parseMenu(obj["menu"]); + if(true == exeOnce) + parseMenu(obj["menu"]); parseSys(obj["system"]); parseStat(obj["statistics"]); parseIv(obj["inverter"]); diff --git a/tools/esp8266/html/serial.html b/tools/esp8266/html/serial.html index e800f371..8bd43c0a 100644 --- a/tools/esp8266/html/serial.html +++ b/tools/esp8266/html/serial.html @@ -70,18 +70,6 @@ var con = document.getElementById("serial"); var exeOnce = true; - function topnav() { - toggle("topnav"); - } - - function parseMenu(obj) { - var e = document.getElementById("topnav"); - e.innerHTML = ""; - for(var i = 0; i < obj["name"].length; i ++) { - e.appendChild(link(obj["link"][i], obj["name"][i])); - } - } - function parseSys(obj) { var up = obj["ts_uptime"]; var days = parseInt(up / 86400) % 365; diff --git a/tools/esp8266/html/setup.html b/tools/esp8266/html/setup.html index c2985886..ea26d0c5 100644 --- a/tools/esp8266/html/setup.html +++ b/tools/esp8266/html/setup.html @@ -29,7 +29,7 @@