From 3ab7d9f6fe9dab21778f60533560111758528f79 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Thu, 20 Oct 2022 18:18:36 +0200 Subject: [PATCH] Fix #246: Allow negative float values This is required for the temperature field which can be negative as well --- 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 | 12 +++- lib/Hoymiles/src/parser/StatisticsParser.h | 1 + 5 files changed, 90 insertions(+), 79 deletions(-) diff --git a/lib/Hoymiles/src/inverters/HM_1CH.h b/lib/Hoymiles/src/inverters/HM_1CH.h index b91546c..6f10745 100644 --- a/lib/Hoymiles/src/inverters/HM_1CH.h +++ b/lib/Hoymiles/src/inverters/HM_1CH.h @@ -12,24 +12,24 @@ public: private: const byteAssign_t byteAssignment[18] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10 }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100 }, - { FLD_PDC, UNIT_W, CH1, 6, 2, 10 }, - { FLD_YD, UNIT_WH, CH1, 12, 2, 1 }, - { FLD_YT, UNIT_KWH, CH1, 8, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC }, + { 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_UAC, UNIT_V, CH0, 14, 2, 10 }, - { FLD_IAC, UNIT_A, CH0, 22, 2, 100 }, - { FLD_PAC, UNIT_W, CH0, 18, 2, 10 }, - { FLD_PRA, UNIT_VA, CH0, 20, 2, 10 }, - { FLD_F, UNIT_HZ, CH0, 16, 2, 100 }, - { FLD_PCT, UNIT_PCT, CH0, 24, 2, 10 }, - { FLD_T, UNIT_C, CH0, 26, 2, 10 }, - { FLD_EVT_LOG, UNIT_CNT, CH0, 28, 2, 1 }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC } + { 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_PCT, UNIT_PCT, CH0, 24, 2, 10, false }, + { FLD_T, UNIT_C, CH0, 26, 2, 10, true }, + { FLD_EVT_LOG, UNIT_CNT, 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 } }; }; \ 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 93d357d..71a5cfe 100644 --- a/lib/Hoymiles/src/inverters/HM_2CH.h +++ b/lib/Hoymiles/src/inverters/HM_2CH.h @@ -12,31 +12,31 @@ public: private: const byteAssign_t byteAssignment[24] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10 }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100 }, - { FLD_PDC, UNIT_W, CH1, 6, 2, 10 }, - { FLD_YD, UNIT_WH, CH1, 22, 2, 1 }, - { FLD_YT, UNIT_KWH, CH1, 14, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC }, + { 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, CH2, 8, 2, 10 }, - { FLD_IDC, UNIT_A, CH2, 10, 2, 100 }, - { FLD_PDC, UNIT_W, CH2, 12, 2, 10 }, - { FLD_YD, UNIT_WH, CH2, 24, 2, 1 }, - { FLD_YT, UNIT_KWH, CH2, 18, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC }, + { 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_UAC, UNIT_V, CH0, 26, 2, 10 }, - { FLD_IAC, UNIT_A, CH0, 34, 2, 100 }, - { FLD_PAC, UNIT_W, CH0, 30, 2, 10 }, - { FLD_PRA, UNIT_VA, CH0, 32, 2, 10 }, - { FLD_F, UNIT_HZ, CH0, 28, 2, 100 }, - { FLD_PCT, UNIT_PCT, CH0, 36, 2, 10 }, - { FLD_T, UNIT_C, CH0, 38, 2, 10 }, - { FLD_EVT_LOG, UNIT_CNT, CH0, 40, 2, 1 }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC } + { 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_PCT, UNIT_PCT, CH0, 36, 2, 10, false }, + { FLD_T, UNIT_C, CH0, 38, 2, 10, true }, + { FLD_EVT_LOG, UNIT_CNT, 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 } }; }; \ 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 4198c0a..d824be6 100644 --- a/lib/Hoymiles/src/inverters/HM_4CH.h +++ b/lib/Hoymiles/src/inverters/HM_4CH.h @@ -12,45 +12,45 @@ public: private: const byteAssign_t byteAssignment[36] = { - { FLD_UDC, UNIT_V, CH1, 2, 2, 10 }, - { FLD_IDC, UNIT_A, CH1, 4, 2, 100 }, - { FLD_PDC, UNIT_W, CH1, 8, 2, 10 }, - { FLD_YD, UNIT_WH, CH1, 20, 2, 1 }, - { FLD_YT, UNIT_KWH, CH1, 12, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC }, + { 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, CH2, CALC_UDC_CH, CH1, CMD_CALC }, - { FLD_IDC, UNIT_A, CH2, 6, 2, 100 }, - { FLD_PDC, UNIT_W, CH2, 10, 2, 10 }, - { FLD_YD, UNIT_WH, CH2, 22, 2, 1 }, - { FLD_YT, UNIT_KWH, CH2, 16, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC }, + { 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, CH3, 24, 2, 10 }, - { FLD_IDC, UNIT_A, CH3, 26, 2, 100 }, - { FLD_PDC, UNIT_W, CH3, 30, 2, 10 }, - { FLD_YD, UNIT_WH, CH3, 42, 2, 1 }, - { FLD_YT, UNIT_KWH, CH3, 34, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH3, CALC_IRR_CH, CH3, CMD_CALC }, + { 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, CH4, CALC_UDC_CH, CH3, CMD_CALC }, - { FLD_IDC, UNIT_A, CH4, 28, 2, 100 }, - { FLD_PDC, UNIT_W, CH4, 32, 2, 10 }, - { FLD_YD, UNIT_WH, CH4, 44, 2, 1 }, - { FLD_YT, UNIT_KWH, CH4, 38, 4, 1000 }, - { FLD_IRR, UNIT_PCT, CH4, CALC_IRR_CH, CH4, CMD_CALC }, + { 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_UAC, UNIT_V, CH0, 46, 2, 10 }, - { FLD_IAC, UNIT_A, CH0, 54, 2, 100 }, - { FLD_PAC, UNIT_W, CH0, 50, 2, 10 }, - { FLD_PRA, UNIT_VA, CH0, 52, 2, 10 }, - { FLD_F, UNIT_HZ, CH0, 48, 2, 100 }, - { FLD_PCT, UNIT_PCT, CH0, 56, 2, 10 }, - { FLD_T, UNIT_C, CH0, 58, 2, 10 }, - { FLD_EVT_LOG, UNIT_CNT, CH0, 60, 2, 1 }, - { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, - { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, - { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, - { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC } + { 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_PCT, UNIT_PCT, CH0, 56, 2, 10, false }, + { FLD_T, UNIT_C, CH0, 58, 2, 10, true }, + { FLD_EVT_LOG, UNIT_CNT, 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 } }; }; \ No newline at end of file diff --git a/lib/Hoymiles/src/parser/StatisticsParser.cpp b/lib/Hoymiles/src/parser/StatisticsParser.cpp index 1789eee..a6abc83 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.cpp +++ b/lib/Hoymiles/src/parser/StatisticsParser.cpp @@ -79,7 +79,17 @@ float StatisticsParser::getChannelFieldValue(uint8_t channel, uint8_t fieldId) val |= _payloadStatistic[ptr]; } while (++ptr != end); - return static_cast(val) / static_cast(div); + float result; + if (b[pos].isSigned && b[pos].num == 2) { + result = static_cast(static_cast(val)); + } else if (b[pos].isSigned && b[pos].num == 4) { + result = static_cast(static_cast(val)); + } else { + result = static_cast(val); + } + + result /= static_cast(div); + return result; } else { // Value has to be calculated return calcFunctions[b[pos].start].func(this, b[pos].num); diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h index d21f82e..b3327fe 100644 --- a/lib/Hoymiles/src/parser/StatisticsParser.h +++ b/lib/Hoymiles/src/parser/StatisticsParser.h @@ -68,6 +68,7 @@ typedef struct { uint8_t start; // pos of first byte in buffer uint8_t num; // number of bytes in buffer uint16_t div; // divisor / calc command + bool isSigned; // allow negative numbers } byteAssign_t; class StatisticsParser : public Parser {