First rough implementation of HMT inverters

include/Configuration.h

@@ -23,7 +23,7 @@
 
 #define INV_MAX_NAME_STRLEN 31
 #define INV_MAX_COUNT 10
-#define INV_MAX_CHAN_COUNT 4
+#define INV_MAX_CHAN_COUNT 6
 
 #define CHAN_MAX_NAME_STRLEN 31
 

lib/Hoymiles/src/Hoymiles.cpp

@@ -6,6 +6,7 @@
 #include "inverters/HMS_1CH.h"
 #include "inverters/HMS_2CH.h"
 #include "inverters/HMS_4CH.h"
+#include "inverters/HMT_6CH.h"
 #include "inverters/HM_1CH.h"
 #include "inverters/HM_2CH.h"
 #include "inverters/HM_4CH.h"
@@ -109,7 +110,9 @@ void HoymilesClass::loop()
 std::shared_ptr<InverterAbstract> HoymilesClass::addInverter(const char* name, uint64_t serial)
 {
     std::shared_ptr<InverterAbstract> i = nullptr;
-    if (HMS_4CH::isValidSerial(serial)) {
+    if (HMT_6CH::isValidSerial(serial)) {
+        i = std::make_shared<HMT_6CH>(_radioCmt.get(), serial);
+    } else if (HMS_4CH::isValidSerial(serial)) {
         i = std::make_shared<HMS_4CH>(_radioCmt.get(), serial);
     } else if (HMS_2CH::isValidSerial(serial)) {
         i = std::make_shared<HMS_2CH>(_radioCmt.get(), serial);

lib/Hoymiles/src/inverters/HMT_6CH.cpp

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2023 Thomas Basler and others
+ */
+#include "HMT_6CH.h"
+
+HMT_6CH::HMT_6CH(HoymilesRadio* radio, uint64_t serial)
+    : HMS_Abstract(radio, serial) {};
+
+bool HMT_6CH::isValidSerial(uint64_t serial)
+{
+    // serial >= 0x138200000000 && serial <= 0x138299999999
+    uint16_t preSerial = (serial >> 32) & 0xffff;
+    return preSerial == 0x1382;
+}
+
+String HMT_6CH::typeName()
+{
+    return F("HMT-1800, HMT-2250");
+}
+
+const std::list<byteAssign_t>* HMT_6CH::getByteAssignment()
+{
+    return &byteAssignment;
+}

lib/Hoymiles/src/inverters/HMT_6CH.h

@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "HMS_Abstract.h"
+
+class HMT_6CH : public HMS_Abstract {
+public:
+    explicit HMT_6CH(HoymilesRadio* radio, uint64_t serial);
+    static bool isValidSerial(uint64_t serial);
+    String typeName();
+    const std::list<byteAssign_t>* getByteAssignment();
+
+private:
+    const std::list<byteAssign_t> byteAssignment = {
+        { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
+        { TYPE_DC, CH0, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 },
+        { TYPE_DC, CH0, FLD_PDC, UNIT_W, 8, 2, 10, false, 1 },
+        { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 12, 4, 1000, false, 3 },
+        { TYPE_DC, CH0, FLD_YD, UNIT_WH, 20, 2, 1, false, 0 },
+        { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
+
+        { TYPE_DC, CH1, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
+        { TYPE_DC, CH1, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 },
+        { TYPE_DC, CH1, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
+        { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 16, 4, 1000, false, 3 },
+        { TYPE_DC, CH1, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 },
+        { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
+
+        { TYPE_DC, CH2, FLD_UDC, UNIT_V, 24, 2, 10, false, 1 },
+        { TYPE_DC, CH2, FLD_IDC, UNIT_A, 26, 2, 100, false, 2 },
+        { TYPE_DC, CH2, FLD_PDC, UNIT_W, 30, 2, 10, false, 1 },
+        { TYPE_DC, CH2, FLD_YT, UNIT_KWH, 34, 4, 1000, false, 3 },
+        { TYPE_DC, CH2, FLD_YD, UNIT_WH, 42, 2, 1, false, 0 },
+        { TYPE_DC, CH2, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH2, CMD_CALC, false, 3 },
+
+        { TYPE_DC, CH3, FLD_UDC, UNIT_V, 24, 2, 10, false, 1 },
+        { TYPE_DC, CH3, FLD_IDC, UNIT_A, 28, 2, 100, false, 2 },
+        { TYPE_DC, CH3, FLD_PDC, UNIT_W, 32, 2, 10, false, 1 },
+        { TYPE_DC, CH3, FLD_YT, UNIT_KWH, 38, 4, 1000, false, 3 },
+        { TYPE_DC, CH3, FLD_YD, UNIT_WH, 44, 2, 1, false, 0 },
+        { TYPE_DC, CH3, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH3, CMD_CALC, false, 3 },
+
+        { TYPE_DC, CH4, FLD_UDC, UNIT_V, 46, 2, 10, false, 1 },
+        { TYPE_DC, CH4, FLD_IDC, UNIT_A, 48, 2, 100, false, 2 },
+        { TYPE_DC, CH4, FLD_PDC, UNIT_W, 52, 2, 10, false, 1 },
+        { TYPE_DC, CH4, FLD_YT, UNIT_KWH, 56, 4, 1000, false, 3 },
+        { TYPE_DC, CH4, FLD_YD, UNIT_WH, 64, 2, 1, false, 0 },
+        { TYPE_DC, CH4, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH4, CMD_CALC, false, 3 },
+
+        { TYPE_DC, CH5, FLD_UDC, UNIT_V, 46, 2, 10, false, 1 },
+        { TYPE_DC, CH5, FLD_IDC, UNIT_A, 50, 2, 100, false, 2 },
+        { TYPE_DC, CH5, FLD_PDC, UNIT_W, 54, 2, 10, false, 1 },
+        { TYPE_DC, CH5, FLD_YT, UNIT_KWH, 60, 4, 1000, false, 3 },
+        { TYPE_DC, CH5, FLD_YD, UNIT_WH, 66, 2, 1, false, 0 },
+        { TYPE_DC, CH5, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH5, CMD_CALC, false, 3 },
+
+        { TYPE_AC, CH0, FLD_UAC, UNIT_V, 68, 2, 10, false, 1 }, // dummy
+        //{ TYPE_AC, CH0, FLD_UAC_1N, UNIT_V, 68, 2, 10, false, 1 },
+        //{ TYPE_AC, CH0, FLD_UAC_2N, UNIT_V, 70, 2, 10, false, 1 },
+        //{ TYPE_AC, CH0, FLD_UAC_3N, UNIT_V, 72, 2, 10, false, 1 },
+        //{ TYPE_AC, CH0, FLD_UAC_12, UNIT_V, 74, 2, 10, false, 1 },
+        //{ TYPE_AC, CH0, FLD_UAC_23, UNIT_V, 76, 2, 10, false, 1 },
+        //{ TYPE_AC, CH0, FLD_UAC_31, UNIT_V, 78, 2, 10, false, 1 },
+        { TYPE_AC, CH0, FLD_F, UNIT_HZ, 80, 2, 100, false, 2 },
+        { TYPE_AC, CH0, FLD_PAC, UNIT_W, 82, 2, 10, false, 1 },
+        { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 84, 2, 10, true, 1 },
+        { TYPE_AC, CH0, FLD_IAC, UNIT_A, 86, 2, 100, false, 2 }, // dummy
+        //{ TYPE_AC, CH0, FLD_IAC_1, UNIT_A, 86, 2, 100, false, 2 },
+        //{ TYPE_AC, CH0, FLD_IAC_2, UNIT_A, 88, 2, 100, false, 2 },
+        //{ TYPE_AC, CH0, FLD_IAC_3, UNIT_A, 90, 2, 100, false, 2 },
+        { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 92, 2, 1000, false, 3 },
+
+        { TYPE_INV, CH0, FLD_T, UNIT_C, 94, 2, 10, true, 1 },
+        { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 96, 2, 1, false, 0 },
+
+        { TYPE_AC, CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 },
+        { TYPE_AC, CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
+        { TYPE_AC, CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 },
+        { TYPE_AC, CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
+    };
+};

lib/Hoymiles/src/parser/StatisticsParser.h

@@ -60,6 +60,8 @@ enum ChannelNum_t {
     CH1,
     CH2,
     CH3,
+    CH4,
+    CH5,
     CH_CNT
 };
 
@@ -72,7 +74,7 @@ const char* const channelsTypes[] = { "AC", "DC", "INV" };
 
 typedef struct {
     ChannelType_t type;
-    ChannelNum_t ch; // channel 0 - 4
+    ChannelNum_t ch; // channel 0 - 5
     FieldId_t fieldId; // field id
     UnitId_t unitId; // uint id
     uint8_t start; // pos of first byte in buffer
@@ -84,7 +86,7 @@ typedef struct {
 
 typedef struct {
     ChannelType_t type;
-    ChannelNum_t ch; // channel 0 - 4
+    ChannelNum_t ch; // channel 0 - 5
     FieldId_t fieldId; // field id
     float offset; // offset (positive/negative) to be applied on the fetched value
 } fieldSettings_t;