MI - first update on HW detection

see https://github.com/lumapu/ahoy/issues/1111

src/hm/hmDefines.h

@@ -25,7 +25,7 @@ enum {FLD_UDC = 0, FLD_IDC, FLD_PDC, FLD_YD, FLD_YW, FLD_YT,
         FLD_FW_BUILD_MONTH_DAY, FLD_FW_BUILD_HOUR_MINUTE, FLD_BOOTLOADER_VER,
         FLD_ACT_ACTIVE_PWR_LIMIT, FLD_PART_NUM, FLD_HW_VERSION, FLD_GRID_PROFILE_CODE,
         FLD_GRID_PROFILE_VERSION,  /*FLD_ACT_REACTIVE_PWR_LIMIT, FLD_ACT_PF,*/ FLD_LAST_ALARM_CODE, FLD_MP};
-        
+
 const char* const fields[] = {"U_DC", "I_DC", "P_DC", "YieldDay", "YieldWeek", "YieldTotal",
         "U_AC", "U_AC_1N", "U_AC_2N", "U_AC_3N", "UAC_12", "UAC_23", "UAC_31", "I_AC",
         "IAC_1", "I_AC_2", "I_AC_3", "P_AC", "F_AC", "Temp", "PF_AC", "Efficiency", "Irradiation","Q_AC",
@@ -260,6 +260,10 @@ typedef struct {
 } devInfo_t;
 
 const devInfo_t devInfo[] = {
+    // MI 2nd gen
+    { 0x13118f, 600 },
+
+
     // MI 3rd gen
     { 0x100230, 1500 },
 

src/hm/miPayload.h

@@ -219,12 +219,13 @@ case InverterDevInform_All:
                     rec->assign  = (byteAssign_t *)InfoAssignment;
                     rec->pyldLen = HMINFO_PAYLOAD_LEN;
                     break;
+
 const byteAssign_t InfoAssignment[] = {
     { FLD_FW_VERSION,           UNIT_NONE,   CH0,  0, 2, 1 },
     { FLD_FW_BUILD_YEAR,        UNIT_NONE,   CH0,  2, 2, 1 },
     { FLD_FW_BUILD_MONTH_DAY,   UNIT_NONE,   CH0,  4, 2, 1 },
     { FLD_FW_BUILD_HOUR_MINUTE, UNIT_NONE,   CH0,  6, 2, 1 },
-    { FLD_HW_ID,                UNIT_NONE,   CH0,  8, 2, 1 }
+    { FLD_BOOTLOADER_VER,       UNIT_NONE,   CH0,  8, 2, 1 }
 };
 */
 
@@ -237,27 +238,37 @@ const byteAssign_t InfoAssignment[] = {
                     mPayload[iv->id].gotFragment = true;
                     if(mSerialDebug) {
                         DPRINT_IVID(DBG_INFO, iv->id);
-                    DPRINT(DBG_INFO,F("HW_VER is "));
-                    DBGPRINTLN(String((p->packet[24] << 8) + p->packet[25]));
+                        DPRINT(DBG_INFO,F("HW_VER is "));
+                        DBGPRINTLN(String((p->packet[24] << 8) + p->packet[25]));
                     }
+                    record_t<> *rec = iv->getRecordStruct(InverterDevInform_Simple);  // choose the record structure
+                    rec->ts = mPayload[iv->id].ts;
+                    iv->setValue(1, rec, (uint16_t) ((p->packet[24] << 8) + p->packet[25])/1);
+                    //28737
                 } else if ( p->packet[9] == 0x01 || p->packet[9] == 0x10 ) {//second frame for MI, 3rd gen. answers in 0x10
                     DPRINT_IVID(DBG_INFO, iv->id);
                     if ( p->packet[9] == 0x01 ) {
                         DBGPRINTLN(F("got 2nd frame (hw info)"));
-                    DPRINT(DBG_INFO,F("HW_PartNo "));
-                    DBGPRINTLN(String((uint32_t) (((p->packet[10] << 8) | p->packet[11]) << 8 | p->packet[12]) << 8 | p->packet[13]));
+                        DPRINT(DBG_INFO,F("HW_PartNo "));
+                        DBGPRINTLN(String((uint32_t) (((p->packet[10] << 8) | p->packet[11]) << 8 | p->packet[12]) << 8 | p->packet[13]));
                         mPayload[iv->id].gotFragment = true;
-                        iv->setValue(iv->getPosByChFld(0, FLD_YT, rec), rec, (float) ((p->packet[20] << 8) + p->packet[21])/1);
+                        record_t<> *rec = iv->getRecordStruct(InverterDevInform_Simple);  // choose the record structure
+                        rec->ts = mPayload[iv->id].ts;
+                        /*for (uint8_t i = 0; i < 5; i++) {
+                            iv->setValue(i, rec, (float) ((p->packet[(10+2*i)] << 8) + p->packet[(11+2*i)])/1);
+                        }*/
+                        iv->setValue(0, rec, (uint32_t) ((((p->packet[10] << 8) | p->packet[11]) << 8 | p->packet[12]) << 8 | p->packet[13])/1);
+
                         if(mSerialDebug) {
-                        DPRINT(DBG_INFO,F("HW_FB_TLmValue "));
-                        DBGPRINTLN(String((p->packet[14] << 8) + p->packet[15]));
-                        DPRINT(DBG_INFO,F("HW_FB_ReSPRT "));
-                        DBGPRINTLN(String((p->packet[16] << 8) + p->packet[17]));
-                        DPRINT(DBG_INFO,F("HW_GridSamp_ResValule "));
-                        DBGPRINTLN(String((p->packet[18] << 8) + p->packet[19]));
+                            DPRINT(DBG_INFO,F("HW_FB_TLmValue "));
+                            DBGPRINTLN(String((p->packet[14] << 8) + p->packet[15]));
+                            DPRINT(DBG_INFO,F("HW_FB_ReSPRT "));
+                            DBGPRINTLN(String((p->packet[16] << 8) + p->packet[17]));
+                            DPRINT(DBG_INFO,F("HW_GridSamp_ResValule "));
+                            DBGPRINTLN(String((p->packet[18] << 8) + p->packet[19]));
                             DPRINT(DBG_INFO,F("HW_ECapValue "));
                             DBGPRINTLN(String((p->packet[20] << 8) + p->packet[21]));
-                    }
+                        }
                     } else {
                         DBGPRINTLN(F("3rd gen. inverter!"));           // see table in OpenDTU code, DevInfoParser.cpp devInfo[]
                     }