Browse Source

0.8.78

* merge PR: Add hint to INV_RESET_MIDNIGHT resp. INV_PAUSE_DURING_NIGHT #1418
* merge PR: simplify rxOffset logic #1417
* code quality improvments
pull/1433/head
lumapu 1 year ago
parent
commit
c290273790
  1. 3
      src/CHANGES.md
  2. 2
      src/eth/ahoyeth.h
  3. 6
      src/utils/helper.cpp
  4. 3
      src/utils/syslog.cpp
  5. 6
      src/web/html/colorBright.css
  6. 16
      src/web/html/colorDark.css
  7. 21
      src/web/html/style.css

3
src/CHANGES.md

@ -4,6 +4,9 @@
* finalized API token access #1415 * finalized API token access #1415
* possible fix of MqTT fix "total values are sent to often" #1421 * possible fix of MqTT fix "total values are sent to often" #1421
* removed `switchCycle` from `hmsRadio.h` #1412 * removed `switchCycle` from `hmsRadio.h` #1412
* merge PR: Add hint to INV_RESET_MIDNIGHT resp. INV_PAUSE_DURING_NIGHT #1418
* merge PR: simplify rxOffset logic #1417
* code quality improvments
## 0.8.77 - 2024-02-08 ## 0.8.77 - 2024-02-08
* merge PR: BugFix: ACK #1414 * merge PR: BugFix: ACK #1414

2
src/eth/ahoyeth.h

@ -49,7 +49,7 @@ class ahoyeth {
#if defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(CONFIG_IDF_TARGET_ESP32S3)
EthSpi mEthSpi; EthSpi mEthSpi;
#endif #endif
settings_t *mConfig = NULL; settings_t *mConfig = nullptr;
uint32_t *mUtcTimestamp; uint32_t *mUtcTimestamp;
AsyncUDP mUdp; // for time server AsyncUDP mUdp; // for time server

6
src/utils/helper.cpp

@ -72,11 +72,10 @@ namespace ah {
String getTimeStrMs(uint64_t t) { String getTimeStrMs(uint64_t t) {
char str[13]; char str[13];
uint16_t m;
if(0 == t) if(0 == t)
sprintf(str, "n/a"); sprintf(str, "n/a");
else { else {
m = t % 1000; uint16_t m = t % 1000;
t = t / 1000; t = t / 1000;
sprintf(str, "%02d:%02d:%02d.%03d", hour(t), minute(t), second(t), m); sprintf(str, "%02d:%02d:%02d.%03d", hour(t), minute(t), second(t), m);
} }
@ -86,14 +85,13 @@ namespace ah {
uint64_t Serial2u64(const char *val) { uint64_t Serial2u64(const char *val) {
char tmp[3]; char tmp[3];
uint64_t ret = 0ULL; uint64_t ret = 0ULL;
uint64_t u64;
memset(tmp, 0, 3); memset(tmp, 0, 3);
for(uint8_t i = 0; i < 6; i++) { for(uint8_t i = 0; i < 6; i++) {
tmp[0] = val[i*2]; tmp[0] = val[i*2];
tmp[1] = val[i*2 + 1]; tmp[1] = val[i*2 + 1];
if((tmp[0] == '\0') || (tmp[1] == '\0')) if((tmp[0] == '\0') || (tmp[1] == '\0'))
break; break;
u64 = strtol(tmp, NULL, 16); uint64_t u64 = strtol(tmp, NULL, 16);
ret |= (u64 << ((5-i) << 3)); ret |= (u64 << ((5-i) << 3));
} }
return ret; return ret;

3
src/utils/syslog.cpp

@ -68,12 +68,11 @@ void DbgSyslog::syslogCb (String msg)
// Send mSyslogBuffer in chunks because mSyslogBuffer is larger than syslog packet size // Send mSyslogBuffer in chunks because mSyslogBuffer is larger than syslog packet size
int packetStart = 0; int packetStart = 0;
int packetSize = 122; // syslog payload depends also on hostname and app int packetSize = 122; // syslog payload depends also on hostname and app
char saveChar;
if (isEolFound) { if (isEolFound) {
mSyslogBuffer[mSyslogBufFill-2]=0; // skip \r\n mSyslogBuffer[mSyslogBufFill-2]=0; // skip \r\n
} }
while(packetStart < mSyslogBufFill) { while(packetStart < mSyslogBufFill) {
saveChar = mSyslogBuffer[packetStart+packetSize]; char saveChar = mSyslogBuffer[packetStart+packetSize];
mSyslogBuffer[packetStart+packetSize] = 0; mSyslogBuffer[packetStart+packetSize] = 0;
log(mConfig->sys.deviceName,SYSLOG_FACILITY, mSyslogSeverity, &mSyslogBuffer[packetStart]); log(mConfig->sys.deviceName,SYSLOG_FACILITY, mSyslogSeverity, &mSyslogBuffer[packetStart]);
mSyslogBuffer[packetStart+packetSize] = saveChar; mSyslogBuffer[packetStart+packetSize] = saveChar;

6
src/web/html/colorBright.css

@ -3,9 +3,9 @@
--fg: #000; --fg: #000;
--fg2: #fff; --fg2: #fff;
--info: #0000dd; --info: #00d;
--warn: #ff7700; --warn: #f70;
--success: #009900; --success: #090;
--input-bg: #eee; --input-bg: #eee;
--table-border: #ccc; --table-border: #ccc;

16
src/web/html/colorDark.css

@ -4,8 +4,8 @@
--fg2: #fff; --fg2: #fff;
--info: #0072c8; --info: #0072c8;
--warn: #ffaa00; --warn: #fa0;
--success: #00bb00; --success: #0b0;
--input-bg: #333; --input-bg: #333;
--table-border: #333; --table-border: #333;
@ -20,14 +20,14 @@
--invalid-bg: #400; --invalid-bg: #400;
--total-head-title: #555511; --total-head-title: #551;
--total-bg: #666622; --total-bg: #662;
--iv-head-title: #115511; --iv-head-title: #151;
--iv-head-bg: #226622; --iv-head-bg: #262;
--iv-dis-title: #333; --iv-dis-title: #333;
--iv-dis: #444; --iv-dis: #444;
--ch-head-title: #112255; --ch-head-title: #125;
--ch-head-bg: #223366; --ch-head-bg: #236;
--ts-head: #333; --ts-head: #333;
--ts-bg: #555; --ts-bg: #555;
} }

21
src/web/html/style.css

@ -16,11 +16,11 @@ span, li, h3, label, fieldset {
color: var(--fg); color: var(--fg);
} }
fieldset, input[type=submit], .btn { fieldset, input[type="submit"], .btn {
border-radius: 4px; border-radius: 4px;
} }
input[type=file] { input[type="file"] {
width: 100%; width: 100%;
} }
@ -33,7 +33,7 @@ textarea {
color: var(--fg2); color: var(--fg2);
} }
svg rect {fill: #0000AA;} svg rect {fill: #00A;}
svg.chart { svg.chart {
background: #f2f2f2; background: #f2f2f2;
border: 2px solid gray; border: 2px solid gray;
@ -44,6 +44,7 @@ div.chartDivContainer {
padding: 1px; padding: 1px;
margin: 1px; margin: 1px;
} }
div.chartdivContainer span { div.chartdivContainer span {
color: var(--fg2); color: var(--fg2);
} }
@ -95,7 +96,7 @@ svg.icon {
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
margin-top:-4x; margin-top:-4x;
padding: 5px 7px 5px 0px; padding: 5px 7px 5px 0;
} }
.icon-info { .icon-info {
@ -141,7 +142,7 @@ svg.icon {
span.seperator { span.seperator {
width: 100%; width: 100%;
height: 1px; height: 1px;
margin: 5px 0px 5px; margin: 5px 0 5px;
background-color: #494949; background-color: #494949;
display: block; display: block;
} }
@ -391,7 +392,7 @@ th {
#footer .left { #footer .left {
color: #bbb; color: #bbb;
margin: 23px 0px 0px 25px; margin: 23px 0 0 25px;
} }
#footer ul { #footer ul {
@ -525,7 +526,7 @@ input, select {
font-size: 13pt; font-size: 13pt;
} }
input[type=text], input[type=password], select, input[type=number] { input[type="text"], input[type="password"], select, input[type="number"] {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -551,7 +552,7 @@ input.btnDel {
input.btn { input.btn {
background-color: var(--primary); background-color: var(--primary);
color: #fff; color: #fff;
border: 0px; border: 0;
padding: 7px 20px 7px 20px; padding: 7px 20px 7px 20px;
margin-bottom: 10px; margin-bottom: 10px;
text-transform: uppercase; text-transform: uppercase;
@ -572,7 +573,7 @@ label {
display: inline-block; display: inline-block;
font-size: 12pt; font-size: 12pt;
padding-right: 10px; padding-right: 10px;
margin: 10px 0px 0px 15px; margin: 10px 0 0 15px;
vertical-align: top; vertical-align: top;
} }
@ -601,7 +602,7 @@ div.ModPwr, div.ModName, div.YieldCor {
div.hr { div.hr {
height: 1px; height: 1px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
margin: 10px 0px 10px; margin: 10px 0 10px;
} }
#note { #note {

Loading…
Cancel
Save