diff --git a/tools/esp8266/hmDefines.h b/tools/esp8266/hmDefines.h index eb6634c4..c9616228 100644 --- a/tools/esp8266/hmDefines.h +++ b/tools/esp8266/hmDefines.h @@ -125,8 +125,9 @@ const byteAssign_t hm1chAssignment[] = { { 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_PFC, UNIT_PCT, CH0, 24, 2, 10 }, { FLD_T, UNIT_C, CH0, 26, 2, 10 }, - { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 24, 2, 1 }, + { FLD_ALARM_MES_ID, UNIT_NONE, 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 }, @@ -158,8 +159,9 @@ const byteAssign_t hm2chAssignment[] = { { 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_PFC, UNIT_PCT, CH0, 36, 2, 10 }, { FLD_T, UNIT_C, CH0, 38, 2, 10 }, - { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 40, 2, 1 }, + { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 40, 2, 1 }, // -> ALARM_MES_CNT??? { 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 },