Merge branch 'You69Man-feature/PR_collection_small_fixes' into development03

src/CHANGES.md

@@ -265,7 +265,7 @@
 
 ## 0.8.39 - 2024-01-01
 * fix MqTT dis_night_comm in the morning #1309 #1286
-* seperated offset for sunrise and sunset #1308
+* separated offset for sunrise and sunset #1308
 * powerlimit (active power control) now has one decimal place (MqTT / API) #1199
 * merge Prometheus metrics fix #1310
 * merge MI grid profile request #1306
@@ -478,7 +478,7 @@
 ## 0.7.61 - 2023-10-01
 * merged `hmPayload` and `hmsPayload` into single class
 * merged generic radio functions into new parent class `radio.h`
-* moved radio statistics into the inverter - each inverter has now seperate statistics which can be accessed by click on the footer in `/live`
+* moved radio statistics into the inverter - each inverter has now separate statistics which can be accessed by click on the footer in `/live`
 * fix compiler warnings #1191
 * fix ePaper logo during night time #1151
 

src/config/settings.h

@@ -152,7 +152,7 @@ typedef struct {
 } cfgIv_t;
 
 typedef struct {
-    bool enabled;
+//    bool enabled;
     cfgIv_t iv[MAX_NUM_INVERTERS];
 
     uint16_t sendInterval;
@@ -755,7 +755,7 @@ class settings {
         void jsonInst(JsonObject obj, bool set = false) {
             if(set) {
                 obj[F("intvl")]          = mCfg.inst.sendInterval;
-                obj[F("en")] = (bool)mCfg.inst.enabled;
+//                obj[F("en")] = (bool)mCfg.inst.enabled;
                 obj[F("rstMidNight")]    = (bool)mCfg.inst.rstYieldMidNight;
                 obj[F("rstNotAvail")]    = (bool)mCfg.inst.rstValsNotAvail;
                 obj[F("rstComStop")]     = (bool)mCfg.inst.rstValsCommStop;
@@ -765,7 +765,7 @@ class settings {
             }
             else {
                 getVal<uint16_t>(obj, F("intvl"), &mCfg.inst.sendInterval);
-                getVal<bool>(obj, F("en"), &mCfg.inst.enabled);
+//                getVal<bool>(obj, F("en"), &mCfg.inst.enabled);
                 getVal<bool>(obj, F("rstMidNight"), &mCfg.inst.rstYieldMidNight);
                 getVal<bool>(obj, F("rstNotAvail"), &mCfg.inst.rstValsNotAvail);
                 getVal<bool>(obj, F("rstComStop"), &mCfg.inst.rstValsCommStop);

src/defines.h

@@ -109,7 +109,7 @@ enum {
 
 typedef struct {
     uint32_t rxFail;
-    uint32_t rxFailNoAnser;
+    uint32_t rxFailNoAnswer;
     uint32_t rxSuccess;
     uint32_t frmCnt;
     uint32_t txCnt;

src/hm/Communication.h

@@ -117,7 +117,7 @@ class Communication : public CommQueue<> {
 
                     //q->iv->radioStatistics.txCnt++;
                     q->iv->radio->mRadioWaitTime.startTimeMonitor(mTimeout);
-                    if(!mIsRetransmit && (q->cmd == AlarmData) || (q->cmd == GridOnProFilePara))
+                    if((!mIsRetransmit && (q->cmd == AlarmData)) || (q->cmd == GridOnProFilePara))
                         incrAttempt((q->cmd == AlarmData)? MORE_ATTEMPS_ALARMDATA : MORE_ATTEMPS_GRIDONPROFILEPARA);
 
                     mIsRetransmit    = false;
@@ -622,7 +622,7 @@ class Communication : public CommQueue<> {
             else if(q->iv->mGotFragment || mCompleteRetry)
                 q->iv->radioStatistics.rxFail++; // got no complete payload
             else
-                q->iv->radioStatistics.rxFailNoAnser++; // got nothing
+                q->iv->radioStatistics.rxFailNoAnswer++; // got nothing
             mWaitTime.startTimeMonitor(1); // maybe remove, side effects unknown
 
             bool keep = false;

src/hm/Heuristic.h

@@ -153,7 +153,7 @@ class Heuristic {
             DBGPRINT(F(", f: "));
             DBGPRINT(String(iv->radioStatistics.rxFail));
             DBGPRINT(F(", n: "));
-            DBGPRINT(String(iv->radioStatistics.rxFailNoAnser));
+            DBGPRINT(String(iv->radioStatistics.rxFailNoAnswer));
             DBGPRINT(F(" | p: "));                                  // better debugging for helpers...
             if((IV_HMS == iv->ivGen) || (IV_HMT == iv->ivGen))
                 DBGPRINTLN(String(iv->config->powerLevel-10));
@@ -217,15 +217,12 @@ class Heuristic {
         }
 
         inline uint8_t id2Ch(uint8_t id) {
-            switch(id) {
+            if (id < RF_MAX_CHANNEL_ID)
-                case 0: return 3;
+                return mChList[id];
-                case 1: return 23;
+            else
-                case 2: return 40;
+                return 3; // standard
-                case 3: return 61;
-                case 4: return 75;
-            }
-            return 3; // standard
         }
+        uint8_t mChList[RF_MAX_CHANNEL_ID] = {03, 23, 40, 61, 75};
 };
 
 

src/hm/hmInverter.h

@@ -288,32 +288,30 @@ class Inverter {
                 uint8_t  end = ptr + rec->assign[pos].num;
                 uint16_t div = rec->assign[pos].div;
 
-                if(NULL != rec) {
+                if(CMD_CALC != div) {
-                    if(CMD_CALC != div) {
+                    uint32_t val = 0;
-                        uint32_t val = 0;
+                    do {
-                        do {
+                        val <<= 8;
-                            val <<= 8;
+                        val |= buf[ptr];
-                            val |= buf[ptr];
+                    } while(++ptr != end);
-                        } while(++ptr != end);
+
-
+                    if ((FLD_T == rec->assign[pos].fieldId) || (FLD_Q == rec->assign[pos].fieldId) || (FLD_PF == rec->assign[pos].fieldId)) {
-                        if ((FLD_T == rec->assign[pos].fieldId) || (FLD_Q == rec->assign[pos].fieldId) || (FLD_PF == rec->assign[pos].fieldId)) {
+                        // temperature, Qvar, and power factor are a signed values
-                            // temperature, Qvar, and power factor are a signed values
+                        rec->record[pos] = ((REC_TYP)((int16_t)val)) / (REC_TYP)(div);
-                            rec->record[pos] = ((REC_TYP)((int16_t)val)) / (REC_TYP)(div);
+                    } else if (FLD_YT == rec->assign[pos].fieldId) {
-                        } else if (FLD_YT == rec->assign[pos].fieldId) {
+                        rec->record[pos] = ((REC_TYP)(val) / (REC_TYP)(div)) + ((REC_TYP)config->yieldCor[rec->assign[pos].ch-1]);
-                            rec->record[pos] = ((REC_TYP)(val) / (REC_TYP)(div)) + ((REC_TYP)config->yieldCor[rec->assign[pos].ch-1]);
+                    } else if (FLD_YD == rec->assign[pos].fieldId) {
-                        } else if (FLD_YD == rec->assign[pos].fieldId) {
+                        float actYD = (REC_TYP)(val) / (REC_TYP)(div);
-                            float actYD = (REC_TYP)(val) / (REC_TYP)(div);
+                        uint8_t idx = rec->assign[pos].ch - 1;
-                            uint8_t idx = rec->assign[pos].ch - 1;
+                        if (mLastYD[idx] > actYD)
-                            if (mLastYD[idx] > actYD)
+                            mOffYD[idx] += mLastYD[idx];
-                                mOffYD[idx] += mLastYD[idx];
+                        mLastYD[idx] = actYD;
-                            mLastYD[idx] = actYD;
+                        rec->record[pos] = mOffYD[idx] + actYD;
-                            rec->record[pos] = mOffYD[idx] + actYD;
+                    } else {
-                        } else {
+                        if ((REC_TYP)(div) > 1)
-                            if ((REC_TYP)(div) > 1)
+                            rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div);
-                                rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div);
+                        else
-                            else
+                            rec->record[pos] = (REC_TYP)(val);
-                                rec->record[pos] = (REC_TYP)(val);
-                        }
                     }
                 }
 

src/hm/hmSystem.h

@@ -16,8 +16,8 @@ class HmSystem {
         HmSystem() {}
 
         void setup(uint32_t *timestamp, cfgInst_t *config, IApp *app) {
-            mInverter[0].timestamp     = timestamp;
+            INVERTERTYPE::timestamp = timestamp;
-            mInverter[0].generalConfig = config;
+            INVERTERTYPE::generalConfig = config;
             //mInverter[0].app           = app;
         }
 

src/publisher/pubMqtt.h

@@ -423,7 +423,7 @@ class PubMqtt {
                 }
 
                 DynamicJsonDocument doc2(512);
-                constexpr static char* unitTotal[] = {"W", "kWh", "Wh", "W"};
+                constexpr static const char* unitTotal[] = {"W", "kWh", "Wh", "W"};
                 doc2[F("name")] = String(name.data());
                 doc2[F("stat_t")] = String(mCfgMqtt->topic) + "/" + ((!total) ? String(iv->config->name) : "total" ) + String(topic.data());
                 doc2[F("unit_of_meas")] = ((!total) ? (iv->getUnit(mDiscovery.sub, rec)) : (unitTotal[mDiscovery.sub]));

src/publisher/pubMqttIvData.h

@@ -222,7 +222,7 @@ class PubMqttIvData {
                 mIv->radioStatistics.txCnt,
                 mIv->radioStatistics.rxSuccess,
                 mIv->radioStatistics.rxFail,
-                mIv->radioStatistics.rxFailNoAnser,
+                mIv->radioStatistics.rxFailNoAnswer,
                 mIv->radioStatistics.retransmits,
                 mIv->radioStatistics.ivLoss,
                 mIv->radioStatistics.ivSent,

src/utils/scheduler.h

@@ -125,8 +125,8 @@ namespace ah {
                         mTicker[i].timeout = timeout;
                         mTicker[i].reload = reload;
                         mTicker[i].isTimestamp = isTimestamp;
-                        memset(mTicker[i].name, 0, 6);
+                        strncpy(mTicker[i].name, name, 5);
-                        strncpy(mTicker[i].name, name, (strlen(name) < 6) ? strlen(name) : 5);
+                        mTicker[i].name[5]=0;
                         if(mMax == i)
                             mMax = i + 1;
                         return i;

src/web/RestApi.h

@@ -426,7 +426,7 @@ class RestApi {
             obj[F("name")]           = String(iv->config->name);
             obj[F("rx_success")]     = iv->radioStatistics.rxSuccess;
             obj[F("rx_fail")]        = iv->radioStatistics.rxFail;
-            obj[F("rx_fail_answer")] = iv->radioStatistics.rxFailNoAnser;
+            obj[F("rx_fail_answer")] = iv->radioStatistics.rxFailNoAnswer;
             obj[F("frame_cnt")]      = iv->radioStatistics.frmCnt;
             obj[F("tx_cnt")]         = iv->radioStatistics.txCnt;
             obj[F("retransmits")]    = iv->radioStatistics.retransmits;

src/web/html/includes/nav.html

@@ -10,15 +10,15 @@
         <a id="nav11" class="acitve" href="/history?v={#VERSION}">{#NAV_HISTORY}</a>
         <a id="nav4" class="hide" href="/serial?v={#VERSION}">{#NAV_WEBSERIAL}</a>
         <a id="nav5" class="hide" href="/setup?v={#VERSION}">{#NAV_SETTINGS}</a>
-        <span class="seperator"></span>
+        <span class="separator"></span>
         <a id="nav6" class="hide" href="/update?v={#VERSION}">Update</a>
         <a id="nav7" class="hide" href="/system?v={#VERSION}">System</a>
-        <span class="seperator"></span>
+        <span class="separator"></span>
         <a id="nav8" href="/api" target="_blank">REST API</a>
         <a id="nav9" href="https://ahoydtu.de" target="_blank">{#NAV_DOCUMENTATION}</a>
         <a id="nav10" href="/about?v={#VERSION}">{#NAV_ABOUT}</a>
         <a id="nav12" href="#" class="hide" target="_blank">Custom Link</a>
-        <span class="seperator"></span>
+        <span class="separator"></span>
         <a id="nav0" class="hide" href="/login">Login</a>
         <a id="nav1" class="hide" href="/logout">Logout</a>
     </div>

src/web/html/style.css

@@ -139,7 +139,7 @@ svg.icon {
     background-color: var(--nav-active);
 }
 
-span.seperator {
+span.separator {
     width: 100%;
     height: 1px;
     margin: 5px 0 5px;

src/web/web.h

@@ -661,7 +661,7 @@ class Web {
             { "max_power",            "gauge",   metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->getMaxPower();} },
             { "radio_rx_success",     "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.rxSuccess;} },
             { "radio_rx_fail",        "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.rxFail;} },
-            { "radio_rx_fail_answer", "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.rxFailNoAnser;} },
+            { "radio_rx_fail_answer", "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.rxFailNoAnswer;} },
             { "radio_frame_cnt",      "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.frmCnt;} },
             { "radio_tx_cnt",         "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.txCnt;} },
             { "radio_retransmits",    "counter" ,metricConstInverterFormat, [](Inverter<> *iv)-> uint64_t {return iv->radioStatistics.retransmits;} },