diff --git a/doc/logo.svg b/doc/logo.svg new file mode 100644 index 00000000..35a5786d --- /dev/null +++ b/doc/logo.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/CHANGES.md b/src/CHANGES.md index 17cb5243..9446e986 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,11 @@ # Development Changes +## 0.7.34 - 2023-08-16 +* fixed timezone offset of alarms +* added `AC` and `DC` to `/live` #1098 +* changed `ESP8266` default NRF24 pin assignments (`D3` = `CE` and `D4` = `IRQ`) +* fixed background of modal window for bright color + ## 0.7.33 - 2023-08-15 * add alarms overview to WebGui #608 * fix webGui total values #1084 diff --git a/src/config/config.h b/src/config/config.h index 0b44d23d..c4947ec8 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -68,8 +68,8 @@ #define DEF_SCLK_PIN 18 #else #define DEF_CS_PIN 15 - #define DEF_CE_PIN 2 - #define DEF_IRQ_PIN 0 + #define DEF_CE_PIN 0 + #define DEF_IRQ_PIN 2 // these are given to relay the correct values via API // they cannot actually be moved for ESP82xx models #define DEF_MISO_PIN 12 diff --git a/src/defines.h b/src/defines.h index c9af1643..9d3f6247 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 33 +#define VERSION_PATCH 34 //------------------------------------- typedef struct { diff --git a/src/hm/hmPayload.h b/src/hm/hmPayload.h index fc6d86d5..441981cf 100644 --- a/src/hm/hmPayload.h +++ b/src/hm/hmPayload.h @@ -291,12 +291,16 @@ class HmPayload { record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser mPayload[iv->id].complete = true; - uint8_t payload[100]; + uint8_t payload[150]; uint8_t payloadLen = 0; - memset(payload, 0, 100); + memset(payload, 0, 150); for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { + if((mPayload[iv->id].len[i] + payloadLen) > 150) { + DPRINTLN(DBG_ERROR, F("payload buffer to small!")); + break; + } memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); payloadLen += (mPayload[iv->id].len[i]); yield(); diff --git a/src/hms/hmsPayload.h b/src/hms/hmsPayload.h index d887253e..c167fd43 100644 --- a/src/hms/hmsPayload.h +++ b/src/hms/hmsPayload.h @@ -276,12 +276,16 @@ class HmsPayload { record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser mPayload[iv->id].complete = true; - uint8_t payload[100]; + uint8_t payload[150]; uint8_t payloadLen = 0; - memset(payload, 0, 100); + memset(payload, 0, 150); for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { + if((mPayload[iv->id].len[i] + payloadLen) > 150) { + DPRINTLN(DBG_ERROR, F("payload buffer to small!")); + break; + } memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); payloadLen += (mPayload[iv->id].len[i]); yield(); diff --git a/src/web/html/colorBright.css b/src/web/html/colorBright.css index 144732b6..81d57326 100644 --- a/src/web/html/colorBright.css +++ b/src/web/html/colorBright.css @@ -15,6 +15,7 @@ --secondary: #0072c8; --nav-active: #555; --footer-bg: #282828; + --modal-bg: #fff; --total-head-title: #8e5903; --total-bg: #b06e04; diff --git a/src/web/html/colorDark.css b/src/web/html/colorDark.css index cd8a848a..549158b9 100644 --- a/src/web/html/colorDark.css +++ b/src/web/html/colorDark.css @@ -15,6 +15,7 @@ --secondary: #0072c8; --nav-active: #555; --footer-bg: #282828; + --modal-bg: #666; --total-head-title: #555511; --total-bg: #666622; diff --git a/src/web/html/style.css b/src/web/html/style.css index 1b794018..bf84aaa3 100644 --- a/src/web/html/style.css +++ b/src/web/html/style.css @@ -677,7 +677,7 @@ div.hr { position: relative; display: flex; width: 100%; - background-color: var(--nav-active); + background-color: var(--modal-bg); background-clip: padding-box; border: 1px solid rgba(0,0,0,.2); flex-direction: column; diff --git a/src/web/html/visualization.html b/src/web/html/visualization.html index f207f68c..cb9b45ef 100644 --- a/src/web/html/visualization.html +++ b/src/web/html/visualization.html @@ -120,8 +120,8 @@ ml("div", {class: "row mt-2"},[ numMid(obj.ch[0][11], "W", "Max AC Power"), numMid(obj.ch[0][8], "W", "DC Power"), - numMid(obj.ch[0][0], "V", "Voltage"), - numMid(obj.ch[0][1], "A", "Current"), + numMid(obj.ch[0][0], "V", "AC Voltage"), + numMid(obj.ch[0][1], "A", "AC Current"), numMid(obj.ch[0][3], "Hz", "Frequency"), numMid(obj.ch[0][9], "%", "Efficiency"), numMid(obj.ch[0][10], "var", "Reactive Power"), @@ -154,13 +154,13 @@ ml("div", {class: "p-2 a-c " + clh}, name), ml("div", {class: "p-2 " + clbg}, [ ml("div", {class: "row"}, [ - numCh(vals[2], units[2], "Power"), + numCh(vals[2], units[2], "DC Power"), numCh(vals[6], units[2], "Max Power"), numCh(vals[5], units[5], "Irradiation"), numCh(vals[3], units[3], "Yield Day"), numCh(vals[4], units[4], "Yield Total"), - numCh(vals[0], units[0], "Voltage"), - numCh(vals[1], units[1], "Current") + numCh(vals[0], units[0], "DC Voltage"), + numCh(vals[1], units[1], "DC Current") ]) ]) ]); @@ -222,6 +222,7 @@ function parseIvAlarm(obj) { var html = []; + var offs = new Date().getTimezoneOffset() * -60; html.push( ml("div", {class: "row"}, [ ml("div", {class: "col"}, ml("strong", {}, "String")), @@ -237,8 +238,8 @@ ml("div", {class: "row"}, [ ml("div", {class: "col mt-3"}, String(a.str)), ml("div", {class: "col mt-3"}, String(a.code)), - ml("div", {class: "col mt-3"}, String(toIsoTimeStr(new Date(a.start * 1000)))), - ml("div", {class: "col mt-3"}, String(toIsoTimeStr(new Date(a.end * 1000)))) + ml("div", {class: "col mt-3"}, String(toIsoTimeStr(new Date((a.start + offs) * 1000)))), + ml("div", {class: "col mt-3"}, String(toIsoTimeStr(new Date((a.end + offs) * 1000)))) ]) ); }