From 1d650b59aeb8aac002da233bfe3a9aa255fcdd6f Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sat, 24 Dec 2022 21:57:03 +0100 Subject: [PATCH] Hoymiles Lib: Add digits column to byteAssignment table This allows to specify amount of digits for calculated fields --- lib/Hoymiles/src/inverters/HM_1CH.h | 36 +++++----- lib/Hoymiles/src/inverters/HM_2CH.h | 48 ++++++------- lib/Hoymiles/src/inverters/HM_4CH.h | 72 ++++++++++---------- lib/Hoymiles/src/parser/StatisticsParser.cpp | 15 +--- lib/Hoymiles/src/parser/StatisticsParser.h | 1 + 5 files changed, 80 insertions(+), 92 deletions(-) diff --git a/lib/Hoymiles/src/inverters/HM_1CH.h b/lib/Hoymiles/src/inverters/HM_1CH.h index 2722ce4..bc17878 100644 --- a/lib/Hoymiles/src/inverters/HM_1CH.h +++ b/lib/Hoymiles/src/inverters/HM_1CH.h @@ -13,24 +13,24 @@ public: private: const byteAssign_t byteAssignment[18] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, - { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false }, - { FLD_YD, UNIT_WH, CH1, 12, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH1, 8, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 }, + { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH1, 12, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH1, 8, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, - { FLD_UAC, UNIT_V, CH0, 14, 2, 10, false }, - { FLD_IAC, UNIT_A, CH0, 22, 2, 100, false }, - { FLD_PAC, UNIT_W, CH0, 18, 2, 10, false }, - { FLD_PRA, UNIT_VA, CH0, 20, 2, 10, false }, - { FLD_F, UNIT_HZ, CH0, 16, 2, 100, false }, - { FLD_PF, UNIT_NONE, CH0, 24, 2, 1000, false }, - { FLD_T, UNIT_C, CH0, 26, 2, 10, true }, - { FLD_EVT_LOG, UNIT_NONE, CH0, 28, 2, 1, false }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false } + { FLD_UAC, UNIT_V, CH0, 14, 2, 10, false, 1 }, + { FLD_IAC, UNIT_A, CH0, 22, 2, 100, false, 2 }, + { FLD_PAC, UNIT_W, CH0, 18, 2, 10, false, 1 }, + { FLD_PRA, UNIT_VA, CH0, 20, 2, 10, false, 1 }, + { FLD_F, UNIT_HZ, CH0, 16, 2, 100, false, 2 }, + { FLD_PF, UNIT_NONE, CH0, 24, 2, 1000, false, 3 }, + { FLD_T, UNIT_C, CH0, 26, 2, 10, true, 1 }, + { FLD_EVT_LOG, UNIT_NONE, CH0, 28, 2, 1, false, 0 }, + { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, + { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false, 3 }, + { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, + { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } }; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/inverters/HM_2CH.h b/lib/Hoymiles/src/inverters/HM_2CH.h index d91f23d..f19b369 100644 --- a/lib/Hoymiles/src/inverters/HM_2CH.h +++ b/lib/Hoymiles/src/inverters/HM_2CH.h @@ -13,31 +13,31 @@ public: private: const byteAssign_t byteAssignment[24] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, - { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false }, - { FLD_YD, UNIT_WH, CH1, 22, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH1, 14, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 }, + { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH1, 22, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH1, 14, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, - { FLD_UDC, UNIT_V, CH2, 8, 2, 10, false }, - { FLD_IDC, UNIT_A, CH2, 10, 2, 100, false }, - { FLD_PDC, UNIT_W, CH2, 12, 2, 10, false }, - { FLD_YD, UNIT_WH, CH2, 24, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH2, 18, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH2, 8, 2, 10, false, 1 }, + { FLD_IDC, UNIT_A, CH2, 10, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH2, 12, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH2, 24, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH2, 18, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false, 3 }, - { FLD_UAC, UNIT_V, CH0, 26, 2, 10, false }, - { FLD_IAC, UNIT_A, CH0, 34, 2, 100, false }, - { FLD_PAC, UNIT_W, CH0, 30, 2, 10, false }, - { FLD_PRA, UNIT_VA, CH0, 32, 2, 10, false }, - { FLD_F, UNIT_HZ, CH0, 28, 2, 100, false }, - { FLD_PF, UNIT_NONE, CH0, 36, 2, 1000, false }, - { FLD_T, UNIT_C, CH0, 38, 2, 10, true }, - { FLD_EVT_LOG, UNIT_NONE, CH0, 40, 2, 1, false }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false } + { FLD_UAC, UNIT_V, CH0, 26, 2, 10, false, 1 }, + { FLD_IAC, UNIT_A, CH0, 34, 2, 100, false, 2 }, + { FLD_PAC, UNIT_W, CH0, 30, 2, 10, false, 1 }, + { FLD_PRA, UNIT_VA, CH0, 32, 2, 10, false, 1 }, + { FLD_F, UNIT_HZ, CH0, 28, 2, 100, false, 2 }, + { FLD_PF, UNIT_NONE, CH0, 36, 2, 1000, false, 3 }, + { FLD_T, UNIT_C, CH0, 38, 2, 10, true, 1 }, + { FLD_EVT_LOG, UNIT_NONE, CH0, 40, 2, 1, false, 0 }, + { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, + { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false, 3 }, + { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, + { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } }; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/inverters/HM_4CH.h b/lib/Hoymiles/src/inverters/HM_4CH.h index 62263d0..9276f69 100644 --- a/lib/Hoymiles/src/inverters/HM_4CH.h +++ b/lib/Hoymiles/src/inverters/HM_4CH.h @@ -13,45 +13,45 @@ public: private: const byteAssign_t byteAssignment[36] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, - { FLD_PDC, UNIT_W, CH1, 8, 2, 10, false }, - { FLD_YD, UNIT_WH, CH1, 20, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH1, 12, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 }, + { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH1, 8, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH1, 20, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH1, 12, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false, 3 }, - { FLD_UDC, UNIT_V, CH2, CALC_UDC_CH, CH1, CMD_CALC, false }, - { FLD_IDC, UNIT_A, CH2, 6, 2, 100, false }, - { FLD_PDC, UNIT_W, CH2, 10, 2, 10, false }, - { FLD_YD, UNIT_WH, CH2, 22, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH2, 16, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH2, CALC_UDC_CH, CH1, CMD_CALC, false, 1 }, + { FLD_IDC, UNIT_A, CH2, 6, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH2, 10, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH2, 22, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH2, 16, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false, 3 }, - { FLD_UDC, UNIT_V, CH3, 24, 2, 10, false }, - { FLD_IDC, UNIT_A, CH3, 26, 2, 100, false }, - { FLD_PDC, UNIT_W, CH3, 30, 2, 10, false }, - { FLD_YD, UNIT_WH, CH3, 42, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH3, 34, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH3, CALC_IRR_CH, CH3, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH3, 24, 2, 10, false, 1 }, + { FLD_IDC, UNIT_A, CH3, 26, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH3, 30, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH3, 42, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH3, 34, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH3, CALC_IRR_CH, CH3, CMD_CALC, false, 3 }, - { FLD_UDC, UNIT_V, CH4, CALC_UDC_CH, CH3, CMD_CALC, false }, - { FLD_IDC, UNIT_A, CH4, 28, 2, 100, false }, - { FLD_PDC, UNIT_W, CH4, 32, 2, 10, false }, - { FLD_YD, UNIT_WH, CH4, 44, 2, 1, false }, - { FLD_YT, UNIT_KWH, CH4, 38, 4, 1000, false }, - { FLD_IRR, UNIT_PCT, CH4, CALC_IRR_CH, CH4, CMD_CALC, false }, + { FLD_UDC, UNIT_V, CH4, CALC_UDC_CH, CH3, CMD_CALC, false, 1 }, + { FLD_IDC, UNIT_A, CH4, 28, 2, 100, false, 2 }, + { FLD_PDC, UNIT_W, CH4, 32, 2, 10, false, 1 }, + { FLD_YD, UNIT_WH, CH4, 44, 2, 1, false, 0 }, + { FLD_YT, UNIT_KWH, CH4, 38, 4, 1000, false, 3 }, + { FLD_IRR, UNIT_PCT, CH4, CALC_IRR_CH, CH4, CMD_CALC, false, 3 }, - { FLD_UAC, UNIT_V, CH0, 46, 2, 10, false }, - { FLD_IAC, UNIT_A, CH0, 54, 2, 100, false }, - { FLD_PAC, UNIT_W, CH0, 50, 2, 10, false }, - { FLD_PRA, UNIT_VA, CH0, 52, 2, 10, false }, - { FLD_F, UNIT_HZ, CH0, 48, 2, 100, false }, - { FLD_PF, UNIT_NONE, CH0, 56, 2, 1000, false }, - { FLD_T, UNIT_C, CH0, 58, 2, 10, true }, - { FLD_EVT_LOG, UNIT_NONE, CH0, 60, 2, 1, false }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false } + { FLD_UAC, UNIT_V, CH0, 46, 2, 10, false, 1 }, + { FLD_IAC, UNIT_A, CH0, 54, 2, 100, false, 2 }, + { FLD_PAC, UNIT_W, CH0, 50, 2, 10, false, 1 }, + { FLD_PRA, UNIT_VA, CH0, 52, 2, 10, false, 1 }, + { FLD_F, UNIT_HZ, CH0, 48, 2, 100, false, 2 }, + { FLD_PF, UNIT_NONE, CH0, 56, 2, 1000, false, 3 }, + { FLD_T, UNIT_C, CH0, 58, 2, 10, true, 1 }, + { FLD_EVT_LOG, UNIT_NONE, CH0, 60, 2, 1, false, 0 }, + { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false, 0 }, + { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false, 3 }, + { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false, 1 }, + { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 } }; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/parser/StatisticsParser.cpp b/lib/Hoymiles/src/parser/StatisticsParser.cpp index 1266f86..0ac833f 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.cpp +++ b/lib/Hoymiles/src/parser/StatisticsParser.cpp @@ -128,20 +128,7 @@ const char* StatisticsParser::getChannelFieldName(uint8_t channel, uint8_t field uint8_t StatisticsParser::getChannelFieldDigits(uint8_t channel, uint8_t fieldId) { uint8_t pos = getAssignIdxByChannelField(channel, fieldId); - const byteAssign_t* b = _byteAssignment; - - switch (b[pos].div) { - case 1: - return 0; - case 10: - return 1; - case 100: - return 2; - case 1000: - return 3; - default: - return 2; - } + return _byteAssignment[pos].digits; } uint8_t StatisticsParser::getChannelCount() diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h index f9c68a5..1ad7a6c 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.h +++ b/lib/Hoymiles/src/parser/StatisticsParser.h @@ -70,6 +70,7 @@ typedef struct { uint8_t num; // number of bytes in buffer uint16_t div; // divisor / calc command bool isSigned; // allow negative numbers + uint8_t digits; // number of valid digits after the decimal point } byteAssign_t; class StatisticsParser : public Parser {