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

Hoymiles Lib: Change field order and move channel to first position

Browse Source
This commit is contained in:
Thomas Basler 2022-12-24 22:34:23 +01:00
parent 1d650b59ae
commit 43d25dd24a
4 changed files with 79 additions and 79 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:
const byteAssign_t byteAssignment[18] = {
{ 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 },
{ CH1, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
{ CH1, FLD_IDC, UNIT_A, 4, 2, 100, false, 2 },
{ CH1, FLD_PDC, UNIT_W, 6, 2, 10, false, 1 },
{ CH1, FLD_YD, UNIT_WH, 12, 2, 1, false, 0 },
{ CH1, FLD_YT, UNIT_KWH, 8, 4, 1000, false, 3 },
{ CH1, FLD_IRR, UNIT_PCT, CALC_IRR_CH, CH1, CMD_CALC, false, 3 },
{ 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 }
{ CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
{ CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
{ CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
{ CH0, FLD_PRA, UNIT_VA, 20, 2, 10, false, 1 },
{ CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
{ CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
{ CH0, FLD_T, UNIT_C, 26, 2, 10, true, 1 },
{ CH0, FLD_EVT_LOG, UNIT_NONE, 28, 2, 1, false, 0 },
{ CH0, FLD_YD, UNIT_WH, CALC_YD_CH0, 0, CMD_CALC, false, 0 },
{ CH0, FLD_YT, UNIT_KWH, CALC_YT_CH0, 0, CMD_CALC, false, 3 },
{ CH0, FLD_PDC, UNIT_W, CALC_PDC_CH0, 0, CMD_CALC, false, 1 },
{ CH0, FLD_EFF, UNIT_PCT, CALC_EFF_CH0, 0, CMD_CALC, false, 3 }
};
};

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

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

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

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

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

@ -63,9 +63,9 @@ enum {
};
typedef struct {
uint8_t ch; // channel 0 - 4
uint8_t fieldId; // field id
uint8_t unitId; // uint id
uint8_t ch; // channel 0 - 4
uint8_t start; // pos of first byte in buffer
uint8_t num; // number of bytes in buffer
uint16_t div; // divisor / calc command