0.8.61 - 2024-01-21

* add favicon to header
* improved NRF communication

src/CHANGES.md

@@ -1,5 +1,9 @@
 # Development Changes
 
+## 0.8.61 - 2024-01-21
+* add favicon to header
+* improved NRF communication
+
 ## 0.8.60 - 2024-01-20
 * merge PR: non blocking nRF loop #1371
 * merge PR: fixed millis in serial log #1373

src/app.cpp

@@ -143,10 +143,12 @@ void app::loop(void) {
     esp_task_wdt_reset();
 
     if(mConfig->nrf.enabled)
-        mNrfRadio.loop();
+        mNrfActive = mNrfRadio.loop();
+
+    if(!mNrfActive) {
         #if defined(ESP32)
         if(mConfig->cmt.enabled)
-        mCmtRadio.loop();
+            mNrfActive = mCmtRadio.loop();
         #endif
 
         ah::Scheduler::loop();
@@ -156,6 +158,7 @@ void app::loop(void) {
         if (mMqttEnabled && mNetworkConnected)
             mMqtt.loop();
         #endif
+    }
     yield();
 }
 

src/app.h

@@ -405,6 +405,7 @@ class app : public IApp, public ah::Scheduler {
         uint8_t mSendLastIvId;
         bool mSendFirst;
         bool mAllIvNotAvail;
+        bool mNrfActive = false;
 
         bool mNetworkConnected;
 

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       60
+#define VERSION_PATCH       61
 
 //-------------------------------------
 typedef struct {

src/hm/Communication.h

@@ -61,11 +61,12 @@ class Communication : public CommQueue<> {
                     mLastEmptyQueueMillis = millis();
                 mPrintSequenceDuration = true;
 
-                /*if(mDebugState != mState) {
+                innerLoop(q);
-                    DPRINT(DBG_INFO, F("State: "));
+            });
-                    DBGHEXLN((uint8_t)(mState));
+        }
-                    mDebugState = mState;
+
-                }*/
+    private:
+        inline void innerLoop(const queue_s *q) {
             switch(mState) {
                 case States::RESET:
                     if (!mWaitTime.isTimeout())
@@ -272,10 +273,8 @@ class Communication : public CommQueue<> {
                     closeRequest(q, true);
                     break;
             }
-            });
         }
 
-    private:
         inline void printRxInfo(const queue_s *q, packet_t *p) {
             DPRINT_IVID(DBG_INFO, q->iv->id);
             DBGPRINT(F("RX "));
@@ -1006,8 +1005,6 @@ class Communication : public CommQueue<> {
         Heuristic mHeu;
         uint32_t mLastEmptyQueueMillis = 0;
         bool mPrintSequenceDuration = false;
-
-        //States mDebugState = States::START;
 };
 
 #endif /*__COMMUNICATION_H__*/

src/hm/hmRadio.h

@@ -78,7 +78,7 @@ class HmRadio : public Radio {
             #else
                 mNrf24->begin(mSpi.get(), ce, cs);
             #endif
-            mNrf24->setRetries(3, 15); // 3*250us + 250us and 15 loops -> 15ms
+            mNrf24->setRetries(3, 15); // 3*250us + 250us and 16 loops -> 15.25ms
 
             mNrf24->setChannel(mRfChLst[mRxChIdx]);
             mNrf24->startListening();
@@ -89,10 +89,7 @@ class HmRadio : public Radio {
             mNrf24->setCRCLength(RF24_CRC_16);
             mNrf24->setAddressWidth(5);
             mNrf24->openReadingPipe(1, reinterpret_cast<uint8_t*>(&DTU_RADIO_ID));
-
+            mNrf24->maskIRQ(false, false, false); // enable all receiving interrupts
-            // enable all receiving interrupts
-            mNrf24->maskIRQ(false, false, false);
-
             mNrf24->setPALevel(1); // low is default
 
             if(mNrf24->isChipConnected()) {
@@ -104,25 +101,23 @@ class HmRadio : public Radio {
                 DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring"));
         }
 
-        void loop(void) {
+        // returns true if communication is active
+        bool loop(void) {
             if (!mIrqRcvd && !mNRFisInRX)
-                return;         // first quick check => nothing to do at all here
+                return false; // first quick check => nothing to do at all here
 
             if(NULL == mLastIv) // prevent reading on NULL object!
-                return;
+                return false;
 
             if(!mIrqRcvd) {     // no news from nRF, check timers
+                if ((millis() - mTimeslotStart) < innerLoopTimeout)
+                    return true; // nothing to do, still waiting
+
                 if (mRadioWaitTime.isTimeout()) { // timeout reached!
                     mNRFisInRX = false;
-                    // add stop listening?
+                    return false;
-                    return;
                 }
 
-                yield();
-
-                if ((millis() - mTimeslotStart) < innerLoopTimeout)
-                    return; // nothing to do
-
                 // otherwise switch to next RX channel
                 mTimeslotStart = millis();
                 if(!mNRFloopChannels && ((mTimeslotStart - mLastIrqTime) > (DURATION_TXFRAME+DURATION_ONEFRAME)))
@@ -140,21 +135,20 @@ class HmRadio : public Radio {
                 mNrf24->setChannel(mRfChLst[tempRxChIdx]);
                 isRxInit = false;
 
-                return;
+                return true; // communicating, but changed RX channel
-            }
+            } else {
-
                 // here we got news from the nRF
-
-            mNrf24->whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH
                 mIrqRcvd     = false;
+                mNrf24->whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH
                 mLastIrqTime = millis();
 
                 if(tx_ok || tx_fail) { // tx related interrupt, basically we should start listening
                     mNrf24->flush_tx();                         // empty TX FIFO
+                    mTxSetupTime = millis() - mMillis;
 
                     if(mNRFisInRX) {
                         DPRINTLN(DBG_WARN, F("unexpected tx irq!"));
-                    return;
+                        return false;
                     }
 
                     mNRFisInRX = true;
@@ -162,13 +156,27 @@ class HmRadio : public Radio {
                         mLastIv->mAckCount++;
 
                     // start listening
+                    if(!mIsRetransmit) {
+                        if(mTxSetupTime < 30) {
+                            mRxChIdx = (mTxChIdx + 4) % RF_CHANNELS;
+                            mNrf24->setChannel(mRfChLst[mRxChIdx]);
+                            mNrf24->startListening();
+
+                            do {
+                                yield();
+                            } while((millis() - mMillis) < 37);
+                        }
+                    }
+                    mIsRetransmit = false;
+
+
                     mRxChIdx = (mTxChIdx + 2) % RF_CHANNELS;
                     mNrf24->setChannel(mRfChLst[mRxChIdx]);
                     mNrf24->startListening();
                     mTimeslotStart = millis();
                     tempRxChIdx = mRxChIdx;
                     rxPendular  = false;
-                mNRFloopChannels = mLastIv->ivGen == IV_MI;
+                    mNRFloopChannels = (mLastIv->ivGen == IV_MI);
 
                     innerLoopTimeout = DURATION_TXFRAME;
                 }
@@ -191,9 +199,14 @@ class HmRadio : public Radio {
                                 mRxChIdx = tempRxChIdx;
                         }
                     }
-                return;
+                    return mNRFisInRX;
+                } /*else if(tx_fail) {
+                    mNRFisInRX = false;
+                    return false;
+                }*/
             }
 
+            return false;
         }
 
         bool isChipConnected(void) {
@@ -283,6 +296,7 @@ class HmRadio : public Radio {
                 }
                 cnt++;
             }
+
             sendPacket(iv, cnt, isRetransmit, (IV_MI != iv->ivGen));
         }
 
@@ -298,12 +312,12 @@ class HmRadio : public Radio {
 
     private:
         inline bool getReceived(void) {
-
             bool isLastPackage = false;
             rx_ready = false; // reset for ACK case
+
             while(mNrf24->available()) {
-                uint8_t len;
+                uint8_t len = mNrf24->getDynamicPayloadSize(); // payload size > 32 -> corrupt payload
-                len = mNrf24->getDynamicPayloadSize(); // if payload size > 32, corrupt payload has been flushed
+
                 if (len > 0) {
                     packet_t p;
                     p.ch   = mRfChLst[tempRxChIdx];
@@ -311,23 +325,25 @@ class HmRadio : public Radio {
                     p.rssi = mNrf24->testRPD() ? -64 : -75;
                     p.millis = millis() - mMillis;
                     mNrf24->read(p.packet, p.len);
+
                     if (p.packet[0] != 0x00) {
                         if(!checkIvSerial(p.packet, mLastIv)) {
                             DPRINT(DBG_WARN, "RX other inverter ");
-                            if(*mPrivacyMode)
+                            if(!*mPrivacyMode)
-                                ah::dumpBuf(p.packet, p.len, 1, 4);
-                            else
                                 ah::dumpBuf(p.packet, p.len);
-                            //return false;
                         } else {
                             mLastIv->mGotFragment = true;
                             mBufCtrl.push(p);
+
                             if (p.packet[0] == (TX_REQ_INFO + ALL_FRAMES))  // response from get information command
                                 isLastPackage = (p.packet[9] > ALL_FRAMES); // > ALL_FRAMES indicates last packet received
-                            else if (p.packet[0] == ( 0x0f + ALL_FRAMES) )  // response from MI get information command
+
+                            if(IV_MI == mLastIv->ivGen) {
+                                if (p.packet[0] == (0x0f + ALL_FRAMES))                  // response from MI get information command
                                     isLastPackage = (p.packet[9] > 0x10);                // > 0x10 indicates last packet received
                                 else if ((p.packet[0] != 0x88) && (p.packet[0] != 0x92)) // ignore MI status messages //#0 was p.packet[0] != 0x00 &&
                                     isLastPackage = true;                                // response from dev control command
+                            }
                             rx_ready = true; //reset in case we first read messages from other inverter or ACK zero payloads
                         }
                     }
@@ -347,6 +363,12 @@ class HmRadio : public Radio {
             mTxChIdx = iv->heuristics.txRfChId;
 
             if(*mSerialDebug) {
+                if(!isRetransmit) {
+                    DPRINT(DBG_INFO, "last tx setup: ");
+                    DBGPRINT(String(mTxSetupTime));
+                    DBGPRINTLN("ms");
+                }
+
                 DPRINT_IVID(DBG_INFO, iv->id);
                 DBGPRINT(F("TX "));
                 DBGPRINT(String(len));
@@ -376,7 +398,7 @@ class HmRadio : public Radio {
             mLastIv = iv;
             iv->mDtuTxCnt++;
             mNRFisInRX = false;
-            mRqstGetRx = true; // preparation only
+            mIsRetransmit = isRetransmit;
         }
 
         uint64_t getIvId(Inverter<> *iv) {
@@ -410,6 +432,8 @@ class HmRadio : public Radio {
         bool isRxInit = true;
         bool rxPendular = false;
         uint32_t innerLoopTimeout = DURATION_LISTEN_MIN;
+        uint8_t mTxSetupTime = 0;
+        bool mIsRetransmit = false;
 
         std::unique_ptr<SPIClass> mSpi;
         std::unique_ptr<RF24> mNrf24;

src/hm/radio.h

@@ -28,8 +28,7 @@ class Radio {
         virtual bool switchFrequency(Inverter<> *iv, uint32_t fromkHz, uint32_t tokHz) { return true; }
         virtual bool switchFrequencyCh(Inverter<> *iv, uint8_t fromCh, uint8_t toCh) { return true; }
         virtual bool isChipConnected(void) { return false; }
-
+        virtual bool loop(void) = 0;
-        virtual void loop(void) {};
 
         void handleIntr(void) {
             mIrqRcvd = true;
@@ -126,7 +125,6 @@ class Radio {
 
         uint32_t mDtuSn;
         volatile bool mIrqRcvd;
-        bool mRqstGetRx;
         bool *mSerialDebug, *mPrivacyMode, *mPrintWholeTrace;
         uint8_t mTxBuf[MAX_RF_PAYLOAD_SIZE];
         uint8_t mFramesExpected = 0x0c;

src/hms/hmsRadio.h

@@ -26,15 +26,16 @@ class CmtRadio : public Radio {
             mPrintWholeTrace = printWholeTrace;
         }
 
-        void loop() {
+        bool loop() {
             mCmt.loop();
             if((!mIrqRcvd) && (!mRqstGetRx))
-                return;
+                return false;
             getRx();
             if(CMT_SUCCESS == mCmt.goRx()) {
                 mIrqRcvd   = false;
                 mRqstGetRx = false;
             }
+            return false;
         }
 
         bool isChipConnected(void) {
@@ -163,11 +164,16 @@ class CmtRadio : public Radio {
             uint8_t status = mCmt.getRx(p.packet, &p.len, 28, &p.rssi);
             if(CMT_SUCCESS == status)
                 mBufCtrl.push(p);
+
+            // this code completly stops communication!
+            //if(p.packet[9] > ALL_FRAMES)          // indicates last frame
+            //    mRadioWaitTime.stopTimeMonitor(); // we got everything we expected and can exit rx mode...
+            //optionally instead: mRadioWaitTime.startTimeMonitor(DURATION_PAUSE_LASTFR); // let the inverter first get back to rx mode?
         }
 
         CmtType mCmt;
-        //bool mRqstGetRx;
         bool mCmtAvail;
+        bool mRqstGetRx = false;
         uint32_t mMillis;
 };
 

src/utils/timemonitor.h

@@ -20,16 +20,14 @@
 class TimeMonitor {
     public:
         /**
-         * A constructor for initializing a TimeMonitor
+         * A constructor for creating a TimeMonitor object
-         * @note TimeMonitor witch default constructor is stopped
          */
         TimeMonitor(void) {}
 
         /**
-         * A constructor for initializing a TimeMonitor
+         * A constructor for initializing a TimeMonitor object
          * @param timeout timeout in ms
          * @param start   (optional) if true, start TimeMonitor immediately
-         * @note TimeMonitor witch default constructor is stopped
          */
         TimeMonitor(uint32_t timeout, bool start = false) {
             if (start)
@@ -50,7 +48,8 @@ class TimeMonitor {
 
         /**
          * Restart the TimeMonitor with already set timeout configuration
-         * @note returns nothing
+         * @note a timeout has to be set before, no need to call
+         *       'startTimeMonitor' before
          */
         void reStartTimeMonitor(void) {
             mStartTime = millis();
@@ -82,7 +81,7 @@ class TimeMonitor {
          *         false: TimeMonitor still in time or TimeMonitor was stopped
          */
         bool isTimeout(void) {
-            if ((mStarted) && (millis() - mStartTime >= mTimeout))
+            if ((mStarted) && ((millis() - mStartTime) >= mTimeout))
                 return true;
             else
                 return false;
@@ -104,7 +103,7 @@ class TimeMonitor {
          */
         uint32_t getResidualTime(void) const {
             uint32_t delayed =  millis() - mStartTime;
-            return(mStarted ? (delayed < mTimeout ? mTimeout - delayed : 0UL) : 0xFFFFFFFFUL);
+            return(mStarted ? (delayed < mTimeout ? (mTimeout - delayed) : 0UL) : 0xFFFFFFFFUL);
         }
 
         /**

src/web/html/includes/header.html

@@ -4,3 +4,4 @@
 <script type="text/javascript" src="api.js?v={#VERSION}"></script>
 <link rel="stylesheet" type="text/css" href="colors.css?v={#VERSION}"/>
 <meta name="robots" content="noindex, nofollow" />
+<link rel="icon" type="image/x-icon" href="/favicon.ico">