patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hoymiles Lib: Add digits column to byteAssignment table

Browse Source 
This allows to specify amount of digits for calculated fields
This commit is contained in:
Thomas Basler 2022-12-24 21:57:03 +01:00
parent 409a737388
commit 1d650b59ae
5 changed files with 80 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Hoymiles/src/inverters/HM_1CH.h
View File

@ -13,24 +13,24 @@ public:
private: private:
const byteAssign_t byteAssignment[18] = { const byteAssign_t byteAssignment[18] = {
{ FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 },
{ FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH1, 6, 2, 10, false }, { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH1, 12, 2, 1, false }, { FLD_YD, UNIT_WH, CH1, 12, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH1, 8, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH1, 8, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
{ FLD_UAC, UNIT_V, CH0, 14, 2, 10, false }, { FLD_UAC, UNIT_V, CH0, 14, 2, 10, false, 1 },
{ FLD_IAC, UNIT_A, CH0, 22, 2, 100, false }, { FLD_IAC, UNIT_A, CH0, 22, 2, 100, false, 2 },
{ FLD_PAC, UNIT_W, CH0, 18, 2, 10, false }, { FLD_PAC, UNIT_W, CH0, 18, 2, 10, false, 1 },
{ FLD_PRA, UNIT_VA, CH0, 20, 2, 10, false }, { FLD_PRA, UNIT_VA, CH0, 20, 2, 10, false, 1 },
{ FLD_F, UNIT_HZ, CH0, 16, 2, 100, false }, { FLD_F, UNIT_HZ, CH0, 16, 2, 100, false, 2 },
{ FLD_PF, UNIT_NONE, CH0, 24, 2, 1000, false }, { FLD_PF, UNIT_NONE, CH0, 24, 2, 1000, false, 3 },
{ FLD_T, UNIT_C, CH0, 26, 2, 10, true }, { FLD_T, UNIT_C, CH0, 26, 2, 10, true, 1 },
{ FLD_EVT_LOG, UNIT_NONE, CH0, 28, 2, 1, false }, { FLD_EVT_LOG, UNIT_NONE, CH0, 28, 2, 1, false, 0 },
{ FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, { 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 }, { 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 }, { 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 } { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

48
lib/Hoymiles/src/inverters/HM_2CH.h
View File

@ -13,31 +13,31 @@ public:
private: private:
const byteAssign_t byteAssignment[24] = { const byteAssign_t byteAssignment[24] = {
{ FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 },
{ FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH1, 6, 2, 10, false }, { FLD_PDC, UNIT_W, CH1, 6, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH1, 22, 2, 1, false }, { FLD_YD, UNIT_WH, CH1, 22, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH1, 14, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH1, 14, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, { FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
{ FLD_UDC, UNIT_V, CH2, 8, 2, 10, false }, { FLD_UDC, UNIT_V, CH2, 8, 2, 10, false, 1 },
{ FLD_IDC, UNIT_A, CH2, 10, 2, 100, false }, { FLD_IDC, UNIT_A, CH2, 10, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH2, 12, 2, 10, false }, { FLD_PDC, UNIT_W, CH2, 12, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH2, 24, 2, 1, false }, { FLD_YD, UNIT_WH, CH2, 24, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH2, 18, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH2, 18, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false }, { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false, 3 },
{ FLD_UAC, UNIT_V, CH0, 26, 2, 10, false }, { FLD_UAC, UNIT_V, CH0, 26, 2, 10, false, 1 },
{ FLD_IAC, UNIT_A, CH0, 34, 2, 100, false }, { FLD_IAC, UNIT_A, CH0, 34, 2, 100, false, 2 },
{ FLD_PAC, UNIT_W, CH0, 30, 2, 10, false }, { FLD_PAC, UNIT_W, CH0, 30, 2, 10, false, 1 },
{ FLD_PRA, UNIT_VA, CH0, 32, 2, 10, false }, { FLD_PRA, UNIT_VA, CH0, 32, 2, 10, false, 1 },
{ FLD_F, UNIT_HZ, CH0, 28, 2, 100, false }, { FLD_F, UNIT_HZ, CH0, 28, 2, 100, false, 2 },
{ FLD_PF, UNIT_NONE, CH0, 36, 2, 1000, false }, { FLD_PF, UNIT_NONE, CH0, 36, 2, 1000, false, 3 },
{ FLD_T, UNIT_C, CH0, 38, 2, 10, true }, { FLD_T, UNIT_C, CH0, 38, 2, 10, true, 1 },
{ FLD_EVT_LOG, UNIT_NONE, CH0, 40, 2, 1, false }, { FLD_EVT_LOG, UNIT_NONE, CH0, 40, 2, 1, false, 0 },
{ FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, { 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 }, { 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 }, { 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 } { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

72
lib/Hoymiles/src/inverters/HM_4CH.h
View File

@ -13,45 +13,45 @@ public:
private: private:
const byteAssign_t byteAssignment[36] = { const byteAssign_t byteAssignment[36] = {
{ FLD_UDC, UNIT_V, CH1, 2, 2, 10, false }, { FLD_UDC, UNIT_V, CH1, 2, 2, 10, false, 1 },
{ FLD_IDC, UNIT_A, CH1, 4, 2, 100, false }, { FLD_IDC, UNIT_A, CH1, 4, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH1, 8, 2, 10, false }, { FLD_PDC, UNIT_W, CH1, 8, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH1, 20, 2, 1, false }, { FLD_YD, UNIT_WH, CH1, 20, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH1, 12, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH1, 12, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH1, CALC_IRR_CH, CH1, CMD_CALC, false }, { 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_UDC, UNIT_V, CH2, CALC_UDC_CH, CH1, CMD_CALC, false, 1 },
{ FLD_IDC, UNIT_A, CH2, 6, 2, 100, false }, { FLD_IDC, UNIT_A, CH2, 6, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH2, 10, 2, 10, false }, { FLD_PDC, UNIT_W, CH2, 10, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH2, 22, 2, 1, false }, { FLD_YD, UNIT_WH, CH2, 22, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH2, 16, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH2, 16, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false }, { FLD_IRR, UNIT_PCT, CH2, CALC_IRR_CH, CH2, CMD_CALC, false, 3 },
{ FLD_UDC, UNIT_V, CH3, 24, 2, 10, false }, { FLD_UDC, UNIT_V, CH3, 24, 2, 10, false, 1 },
{ FLD_IDC, UNIT_A, CH3, 26, 2, 100, false }, { FLD_IDC, UNIT_A, CH3, 26, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH3, 30, 2, 10, false }, { FLD_PDC, UNIT_W, CH3, 30, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH3, 42, 2, 1, false }, { FLD_YD, UNIT_WH, CH3, 42, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH3, 34, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH3, 34, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH3, CALC_IRR_CH, CH3, CMD_CALC, false }, { 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_UDC, UNIT_V, CH4, CALC_UDC_CH, CH3, CMD_CALC, false, 1 },
{ FLD_IDC, UNIT_A, CH4, 28, 2, 100, false }, { FLD_IDC, UNIT_A, CH4, 28, 2, 100, false, 2 },
{ FLD_PDC, UNIT_W, CH4, 32, 2, 10, false }, { FLD_PDC, UNIT_W, CH4, 32, 2, 10, false, 1 },
{ FLD_YD, UNIT_WH, CH4, 44, 2, 1, false }, { FLD_YD, UNIT_WH, CH4, 44, 2, 1, false, 0 },
{ FLD_YT, UNIT_KWH, CH4, 38, 4, 1000, false }, { FLD_YT, UNIT_KWH, CH4, 38, 4, 1000, false, 3 },
{ FLD_IRR, UNIT_PCT, CH4, CALC_IRR_CH, CH4, CMD_CALC, false }, { FLD_IRR, UNIT_PCT, CH4, CALC_IRR_CH, CH4, CMD_CALC, false, 3 },
{ FLD_UAC, UNIT_V, CH0, 46, 2, 10, false }, { FLD_UAC, UNIT_V, CH0, 46, 2, 10, false, 1 },
{ FLD_IAC, UNIT_A, CH0, 54, 2, 100, false }, { FLD_IAC, UNIT_A, CH0, 54, 2, 100, false, 2 },
{ FLD_PAC, UNIT_W, CH0, 50, 2, 10, false }, { FLD_PAC, UNIT_W, CH0, 50, 2, 10, false, 1 },
{ FLD_PRA, UNIT_VA, CH0, 52, 2, 10, false }, { FLD_PRA, UNIT_VA, CH0, 52, 2, 10, false, 1 },
{ FLD_F, UNIT_HZ, CH0, 48, 2, 100, false }, { FLD_F, UNIT_HZ, CH0, 48, 2, 100, false, 2 },
{ FLD_PF, UNIT_NONE, CH0, 56, 2, 1000, false }, { FLD_PF, UNIT_NONE, CH0, 56, 2, 1000, false, 3 },
{ FLD_T, UNIT_C, CH0, 58, 2, 10, true }, { FLD_T, UNIT_C, CH0, 58, 2, 10, true, 1 },
{ FLD_EVT_LOG, UNIT_NONE, CH0, 60, 2, 1, false }, { FLD_EVT_LOG, UNIT_NONE, CH0, 60, 2, 1, false, 0 },
{ FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false }, { 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 }, { 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 }, { 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 } { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
}; };
}; };

15
lib/Hoymiles/src/parser/StatisticsParser.cpp
View File

@ -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 StatisticsParser::getChannelFieldDigits(uint8_t channel, uint8_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); uint8_t pos = getAssignIdxByChannelField(channel, fieldId);
const byteAssign_t* b = _byteAssignment; return _byteAssignment[pos].digits;
switch (b[pos].div) {
case 1:
return 0;
case 10:
return 1;
case 100:
return 2;
case 1000:
return 3;
default:
return 2;
}
} }
uint8_t StatisticsParser::getChannelCount() uint8_t StatisticsParser::getChannelCount()

1
lib/Hoymiles/src/parser/StatisticsParser.h
View File

@ -70,6 +70,7 @@ typedef struct {
uint8_t num; // number of bytes in buffer uint8_t num; // number of bytes in buffer
uint16_t div; // divisor / calc command uint16_t div; // divisor / calc command
bool isSigned; // allow negative numbers bool isSigned; // allow negative numbers
uint8_t digits; // number of valid digits after the decimal point
} byteAssign_t; } byteAssign_t;
class StatisticsParser : public Parser { class StatisticsParser : public Parser {