fix merge changes

src/app.cpp

@@ -64,11 +64,11 @@ void app::setup() {
     if(!mNrfRadio.isChipConnected())
             DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring"));
     }
-    if(mConfig->cmt.enabled) {
+    //if(mConfig->cmt.enabled) {
         mHmsPayload.setup(this, &mSys, &mCmtRadio, &mStat, 5, &mTimestamp);
         mHmsPayload.enableSerialDebug(mConfig->serial.debug);
         mHmsPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
-    }
+    //}
 
     /*DBGPRINTLN("--- after payload");
     DBGPRINTLN(String(ESP.getFreeHeap()));
@@ -167,7 +167,7 @@ void app::loopStandard(void) {
             mCmtRadio.mBufCtrl.pop();
             yield();
         }
-        mHmsPayload.process(true);
+        //mHmsPayload.process(true);
     }
     #endif
     mPayload.loop();

src/hm/miPayload.h

@@ -99,7 +99,7 @@ class MiPayload {
                 cmd2 = 0x00;
             };
 
-            mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd);
+            mRadio->prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd);
             mPayload[iv->id].txCmd = cmd;
             if (iv->type == INV_TYPE_1CH || iv->type == INV_TYPE_2CH) {
                 mPayload[iv->id].dataAB[CH1] = false;
@@ -343,7 +343,7 @@ class MiPayload {
                                         }
                                         DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX));
                                         //mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true);
-                                        mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd);
+                                        mRadio->prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd);
                                         mPayload[iv->id].txCmd = cmd;
                                         yield();
                                     }

src/hms/hmsPayload.h

@@ -381,7 +381,7 @@ class HmsPayload {
         void reset(uint8_t id) {
             DPRINT(DBG_INFO, "resetPayload: id: ");
             DBGPRINTLN(String(id));
-            memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES);
+            memset(&mPayload[id], 0, sizeof(hmsPayload_t));
             //mPayload[id].txCmd       = 0;
             mPayload[id].gotFragment = false;
             //mPayload[id].retransmits = 0;