Merge branch 'new_communication' into new_communication_mi

src/app.cpp

@@ -413,13 +413,15 @@ void app::tickSend(void) {
     for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) {
         Inverter<> *iv = mSys.getInverterByPos(i);
         if(NULL != iv) {
-            iv->tickSend([this, iv](uint8_t cmd, bool isDevControl) {
-                if(isDevControl)
-                    mCommunication.addImportant(iv, cmd);
-                else
-                    mCommunication.add(iv, cmd);
-            });
-        };
+            if(iv->config->enabled) {
+                iv->tickSend([this, iv](uint8_t cmd, bool isDevControl) {
+                    if(isDevControl)
+                        mCommunication.addImportant(iv, cmd);
+                    else
+                        mCommunication.add(iv, cmd);
+                });
+            }
+        }
     }
 
     /*if(mConfig->nrf.enabled) {
@@ -468,9 +470,9 @@ void app::tickSend(void) {
         if (mConfig->serial.debug)
             DPRINTLN(DBG_WARN, F("Time not set or it is night time, therefore no communication to the inverter!"));
     }
-    yield();
+    yield();*/
 
-    updateLed();*/
+    updateLed();
 }
 
 //-----------------------------------------------------------------------------

src/hm/Communication.h

@@ -416,6 +416,7 @@ class Communication : public CommQueue<> {
             { FLD_BOOTLOADER_VER,       UNIT_NONE,   CH0,  8, 2, 1 }
             };
             */
+
             if ( p->packet[9] == 0x00 ) {//first frame
                 //FLD_FW_VERSION
                 for (uint8_t i = 0; i < 5; i++) {

src/hms/hmsRadio.h

@@ -44,7 +44,7 @@ class CmtRadio : public Radio {
             return mCmtAvail;
         }
 
-        void sendControlPacket(Inverter<> *iv, uint8_t cmd, uint16_t *data, bool isRetransmit, bool isNoMI = true, uint16_t powerMax = 0) {
+        void sendControlPacket(Inverter<> *iv, uint8_t cmd, uint16_t *data, bool isRetransmit) {
             DPRINT(DBG_INFO, F("sendControlPacket cmd: 0x"));
             DBGHEXLN(cmd);
             initPacket(iv->radioId.u64, TX_REQ_DEVCONTROL, SINGLE_FRAME);
@@ -101,6 +101,10 @@ class CmtRadio : public Radio {
             return iv->radioId.u64;
         }
 
+        uint8_t getIvGen(Inverter<> *iv) {
+            return iv->ivGen;
+        }
+
         inline void reset(bool genDtuSn) {
             if(genDtuSn)
                 generateDtuSn();