Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development

helgeerbe · Apr 25, 2023 · 37b5edb · 37b5edb
2 parents 71dda4b + 8a85aea
commit 37b5edb
Show file tree

Hide file tree

Showing 42 changed files with 708 additions and 428 deletions.
diff --git a/README.md b/README.md
@@ -508,6 +508,7 @@ A documentation of the Web API can be found here: [Web-API Documentation](docs/W
 * If your problem persists, check the  [Issues on Github](https://github.com/tbnobody/OpenDTU/issues). Please inspect not only the open issues, also the closed issues contain useful information.
 * Another source of information are the [Discussions](https://github.com/tbnobody/OpenDTU/discussions/)
 * When flashing with VSCode Plattform.IO fails and also with ESPRESSIF tool a demo bin file cannot be flashed to the ESP32 with error message "A fatal error occurred: MD5 of file does not match data in flash!" than un-wire/unconnect ESP32 from the NRF24L01+ board. Try to flash again and rewire afterwards.
+* Make sure to connect one inverter only to one DTU (Original, Ahoy, OpenDTU doesn't make a difference). If you query a inverter by multiple DTUs you will get strange peaks in your values.
 
 ## Related Projects
 

diff --git a/docs/DeviceProfiles/olimex_esp32_poe.json b/docs/DeviceProfiles/olimex_esp32_poe.json
@@ -64,7 +64,7 @@
             "clk_mode": 3
         },
         "display": {
-            "type": 2,
+            "type": 3,
             "data": 33,
             "clk": 32
         }

diff --git a/include/MqttHandleInverterTotal.h b/include/MqttHandleInverterTotal.h
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <TimeoutHelper.h>
+
+class MqttHandleInverterTotalClass {
+public:
+    void init();
+    void loop();
+
+private:
+    TimeoutHelper _lastPublish;
+};
+
+extern MqttHandleInverterTotalClass MqttHandleInverterTotal;
diff --git a/lib/CMT2300a/cmt_spi3.c b/lib/CMT2300a/cmt_spi3.c
@@ -3,10 +3,16 @@
 #include <driver/spi_master.h>
 #include <esp_rom_gpio.h> // for esp_rom_gpio_connect_out_signal
 
+SemaphoreHandle_t paramLock=NULL;
+#define SPI_PARAM_LOCK()    do {} while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS)
+#define SPI_PARAM_UNLOCK()  xSemaphoreGive(paramLock)
+
 spi_device_handle_t spi_reg, spi_fifo;
 
 void cmt_spi3_init(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int8_t pin_fcs, uint32_t spi_speed)
 {
+    paramLock = xSemaphoreCreateMutex();
+
     spi_bus_config_t buscfg = {
         .mosi_io_num = pin_sdio,
         .miso_io_num = -1, // single wire MOSI/MISO
@@ -62,7 +68,9 @@ void cmt_spi3_write(uint8_t addr, uint8_t dat)
         .tx_buffer = &tx_data,
         .rx_buffer = NULL
     };
+    SPI_PARAM_LOCK();
     ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
+    SPI_PARAM_UNLOCK();
     delayMicroseconds(100);
 }
 
@@ -76,7 +84,9 @@ uint8_t cmt_spi3_read(uint8_t addr)
         .tx_buffer = &tx_data,
         .rx_buffer = &rx_data
     };
+    SPI_PARAM_LOCK();
     ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
+    SPI_PARAM_UNLOCK();
     delayMicroseconds(100);
     return rx_data;
 }
@@ -92,11 +102,13 @@ void cmt_spi3_write_fifo(const uint8_t* buf, uint16_t len)
         .rx_buffer = NULL
     };
 
+    SPI_PARAM_LOCK();
     for (uint8_t i = 0; i < len; i++) {
         tx_data = ~buf[i]; // negate buffer contents
         ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
         delayMicroseconds(4); // > 4 us
     }
+    SPI_PARAM_UNLOCK();
 }
 
 void cmt_spi3_read_fifo(uint8_t* buf, uint16_t len)
@@ -110,9 +122,11 @@ void cmt_spi3_read_fifo(uint8_t* buf, uint16_t len)
         .rx_buffer = &rx_data
     };
 
+    SPI_PARAM_LOCK();
     for (uint8_t i = 0; i < len; i++) {
         ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
         delayMicroseconds(4); // > 4 us
         buf[i] = rx_data;
     }
+    SPI_PARAM_UNLOCK();
 }
diff --git a/lib/Hoymiles/src/HoymilesRadio.cpp b/lib/Hoymiles/src/HoymilesRadio.cpp
@@ -66,11 +66,6 @@ bool HoymilesRadio::isInitialized()
     return _isInitialized;
 }
 
-bool HoymilesRadio::isConfigured()
-{
-    return _isConfigured;
-}
-
 bool HoymilesRadio::isIdle()
 {
     return !_busyFlag;

diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h
@@ -13,7 +13,6 @@ class HoymilesRadio {
 
     bool isIdle();
     bool isInitialized();
-    bool isConfigured();
 
     template <typename T>
     T* enqueCommand()
@@ -34,6 +33,5 @@ class HoymilesRadio {
     serial_u _dtuSerial;
     std::queue<std::shared_ptr<CommandAbstract>> _commandQueue;
     bool _isInitialized = false;
-    bool _isConfigured = false;
     bool _busyFlag = false;
 };
diff --git a/lib/Hoymiles/src/HoymilesRadio_CMT.cpp b/lib/Hoymiles/src/HoymilesRadio_CMT.cpp
@@ -63,7 +63,6 @@ void HoymilesRadio_CMT::init(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int
 
     cmtSwitchDtuFreq(_inverterTargetFrequency); // start dtu at work freqency, for fast Rx if inverter is already on and frequency switched
 
-    _isConfigured = true;
     if (!_radio->isChipConnected()) {
         Hoymiles.getMessageOutput()->println("CMT: Connection error!!");
         return;

diff --git a/lib/Hoymiles/src/HoymilesRadio_NRF.cpp b/lib/Hoymiles/src/HoymilesRadio_NRF.cpp
@@ -23,7 +23,6 @@ void HoymilesRadio_NRF::init(SPIClass* initialisedSpiBus, uint8_t pinCE, uint8_t
     _radio->setAddressWidth(5);
     _radio->setRetries(0, 0);
     _radio->maskIRQ(true, true, false); // enable only receiving interrupts
-    _isConfigured = true;
     if (!_radio->isChipConnected()) {
         Hoymiles.getMessageOutput()->println("NRF: Connection error!!");
         return;

diff --git a/lib/Hoymiles/src/commands/CommandAbstract.h b/lib/Hoymiles/src/commands/CommandAbstract.h
@@ -57,5 +57,5 @@ class CommandAbstract {
     uint64_t _routerAddress;
 
 private:
-    void convertSerialToPacketId(uint8_t buffer[], uint64_t serial);
+    static void convertSerialToPacketId(uint8_t buffer[], uint64_t serial);
 };
diff --git a/lib/Hoymiles/src/inverters/HMS_1CH.cpp b/lib/Hoymiles/src/inverters/HMS_1CH.cpp
@@ -4,6 +4,30 @@
  */
 #include "HMS_1CH.h"
 
+static const 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, 6, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_YD, UNIT_WH, 12, 2, 1, false, 0 },
+    { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 8, 4, 1000, false, 3 },
+    { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
+
+    { TYPE_AC, CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 20, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
+
+    { TYPE_INV, CH0, FLD_T, UNIT_C, 26, 2, 10, true, 1 },
+    { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 28, 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 }
+};
+
 HMS_1CH::HMS_1CH(HoymilesRadio* radio, uint64_t serial)
     : HMS_Abstract(radio, serial) {};
 
@@ -19,7 +43,12 @@ String HMS_1CH::typeName()
     return "HMS-300, HMS-350, HMS-400, HMS-450, HMS-500";
 }
 
-const std::list<byteAssign_t>* HMS_1CH::getByteAssignment()
+const byteAssign_t* HMS_1CH::getByteAssignment()
+{
+    return byteAssignment;
+}
+
+uint8_t HMS_1CH::getByteAssignmentSize()
 {
-    return &byteAssignment;
+    return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
 }
diff --git a/lib/Hoymiles/src/inverters/HMS_1CH.h b/lib/Hoymiles/src/inverters/HMS_1CH.h
@@ -9,30 +9,6 @@ class HMS_1CH : public HMS_Abstract {
     explicit HMS_1CH(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, 6, 2, 10, false, 1 },
-        { TYPE_DC, CH0, FLD_YD, UNIT_WH, 12, 2, 1, false, 0 },
-        { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 8, 4, 1000, false, 3 },
-        { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
-
-        { TYPE_AC, CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
-        { TYPE_AC, CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 20, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
-        { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
-
-        { TYPE_INV, CH0, FLD_T, UNIT_C, 26, 2, 10, true, 1 },
-        { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 28, 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 }
-    };
+    const byteAssign_t* getByteAssignment();
+    uint8_t getByteAssignmentSize();
 };
diff --git a/lib/Hoymiles/src/inverters/HMS_2CH.cpp b/lib/Hoymiles/src/inverters/HMS_2CH.cpp
@@ -4,6 +4,37 @@
  */
 #include "HMS_2CH.h"
 
+static const byteAssign_t byteAssignment[] = {
+    { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 },
+    { TYPE_DC, CH0, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 },
+    { TYPE_DC, CH0, FLD_YD, UNIT_WH, 22, 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, 4, 2, 10, false, 1 },
+    { TYPE_DC, CH1, FLD_IDC, UNIT_A, 8, 2, 100, false, 2 },
+    { TYPE_DC, CH1, FLD_PDC, UNIT_W, 12, 2, 10, false, 1 },
+    { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 18, 4, 1000, false, 3 },
+    { TYPE_DC, CH1, FLD_YD, UNIT_WH, 24, 2, 1, false, 0 },
+    { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
+
+    { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 32, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
+
+    { TYPE_INV, CH0, FLD_T, UNIT_C, 38, 2, 10, true, 1 },
+    { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 40, 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 }
+};
+
 HMS_2CH::HMS_2CH(HoymilesRadio* radio, uint64_t serial)
     : HMS_Abstract(radio, serial) {};
 
@@ -19,7 +50,12 @@ String HMS_2CH::typeName()
     return "HMS-600, HMS-700, HMS-800, HMS-900, HMS-1000";
 }
 
-const std::list<byteAssign_t>* HMS_2CH::getByteAssignment()
+const byteAssign_t* HMS_2CH::getByteAssignment()
+{
+    return byteAssignment;
+}
+
+uint8_t HMS_2CH::getByteAssignmentSize()
 {
-    return &byteAssignment;
+    return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
 }
diff --git a/lib/Hoymiles/src/inverters/HMS_2CH.h b/lib/Hoymiles/src/inverters/HMS_2CH.h
@@ -9,37 +9,6 @@ class HMS_2CH : public HMS_Abstract {
     explicit HMS_2CH(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, 6, 2, 100, false, 2 },
-        { TYPE_DC, CH0, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
-        { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 },
-        { TYPE_DC, CH0, FLD_YD, UNIT_WH, 22, 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, 4, 2, 10, false, 1 },
-        { TYPE_DC, CH1, FLD_IDC, UNIT_A, 8, 2, 100, false, 2 },
-        { TYPE_DC, CH1, FLD_PDC, UNIT_W, 12, 2, 10, false, 1 },
-        { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 18, 4, 1000, false, 3 },
-        { TYPE_DC, CH1, FLD_YD, UNIT_WH, 24, 2, 1, false, 0 },
-        { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
-
-        { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
-        { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 32, 2, 10, false, 1 },
-        { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
-        { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
-
-        { TYPE_INV, CH0, FLD_T, UNIT_C, 38, 2, 10, true, 1 },
-        { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 40, 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 }
-    };
+    const byteAssign_t* getByteAssignment();
+    uint8_t getByteAssignmentSize();
 };
diff --git a/lib/Hoymiles/src/inverters/HMS_4CH.cpp b/lib/Hoymiles/src/inverters/HMS_4CH.cpp
@@ -4,6 +4,51 @@
  */
 #include "HMS_4CH.h"
 
+static const byteAssign_t byteAssignment[] = {
+    { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 },
+    { TYPE_DC, CH0, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 },
+    { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 },
+    { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH0, CMD_CALC, false, 3 },
+
+    { TYPE_DC, CH1, FLD_UDC, UNIT_V, 4, 2, 10, false, 1 },
+    { TYPE_DC, CH1, FLD_IDC, UNIT_A, 8, 2, 100, false, 2 },
+    { TYPE_DC, CH1, FLD_PDC, UNIT_W, 12, 2, 10, false, 1 },
+    { TYPE_DC, CH1, FLD_YD, UNIT_WH, 24, 2, 1, false, 0 },
+    { TYPE_DC, CH1, FLD_YT, UNIT_KWH, 18, 4, 1000, false, 3 },
+    { TYPE_DC, CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
+
+    { TYPE_DC, CH2, FLD_UDC, UNIT_V, 26, 2, 10, false, 1 },
+    { TYPE_DC, CH2, FLD_IDC, UNIT_A, 30, 2, 100, false, 2 },
+    { TYPE_DC, CH2, FLD_PDC, UNIT_W, 34, 2, 10, false, 1 },
+    { TYPE_DC, CH2, FLD_YD, UNIT_WH, 46, 2, 1, false, 0 },
+    { TYPE_DC, CH2, FLD_YT, UNIT_KWH, 38, 4, 1000, false, 3 },
+    { TYPE_DC, CH2, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH2, CMD_CALC, false, 3 },
+
+    { TYPE_DC, CH3, FLD_UDC, UNIT_V, 28, 2, 10, false, 1 },
+    { TYPE_DC, CH3, FLD_IDC, UNIT_A, 32, 2, 100, false, 2 },
+    { TYPE_DC, CH3, FLD_PDC, UNIT_W, 36, 2, 10, false, 1 },
+    { TYPE_DC, CH3, FLD_YD, UNIT_WH, 48, 2, 1, false, 0 },
+    { TYPE_DC, CH3, FLD_YT, UNIT_KWH, 42, 4, 1000, false, 3 },
+    { TYPE_DC, CH3, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH3, CMD_CALC, false, 3 },
+
+    { TYPE_AC, CH0, FLD_UAC, UNIT_V, 50, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_IAC, UNIT_A, 58, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PAC, UNIT_W, 54, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_PRA, UNIT_VA, 56, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_F, UNIT_HZ, 52, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 60, 2, 1000, false, 3 },
+
+    { TYPE_INV, CH0, FLD_T, UNIT_C, 62, 2, 10, true, 1 },
+    { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 64, 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 }
+};
+
 HMS_4CH::HMS_4CH(HoymilesRadio* radio, uint64_t serial)
     : HMS_Abstract(radio, serial) {};
 
@@ -19,7 +64,12 @@ String HMS_4CH::typeName()
     return "HMS-1600, HMS-1800, HMS-2000";
 }
 
-const std::list<byteAssign_t>* HMS_4CH::getByteAssignment()
+const byteAssign_t* HMS_4CH::getByteAssignment()
+{
+    return byteAssignment;
+}
+
+uint8_t HMS_4CH::getByteAssignmentSize()
 {
-    return &byteAssignment;
+    return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
 }