|
|
@ -23,12 +23,12 @@ const char* const units[] = {"V", "A", "W", "Wh", "kWh", "Hz", "°C", "%","VAr", |
|
|
|
|
|
|
|
// field types
|
|
|
|
enum {FLD_UDC = 0, FLD_IDC, FLD_PDC, FLD_YD, FLD_YW, FLD_YT, |
|
|
|
FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_T, FLD_PCT, FLD_EFF, |
|
|
|
FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_T, FLD_PFC, FLD_EFF, |
|
|
|
FLD_IRR, FLD_PRA,FLD_ALARM_MES_ID,FLD_FW_VERSION,FLD_FW_BUILD_YEAR, |
|
|
|
FLD_FW_BUILD_MONTH_DAY,FLD_HW_ID,FLD_ACT_PWR_LIMIT,FLD_LAST_ALARM_CODE}; |
|
|
|
|
|
|
|
const char* const fields[] = {"U_DC", "I_DC", "P_DC", "YieldDay", "YieldWeek", "YieldTotal", |
|
|
|
"U_AC", "I_AC", "P_AC", "Freq", "Temp", "Pct", "Efficiency", "Irradiation","P_ACr", |
|
|
|
"U_AC", "I_AC", "P_AC", "Freq", "Temp", "PFC", "Efficiency", "Irradiation","P_ACr", |
|
|
|
"ALARM_MES_ID","FWVersion","FWBuildYear","FWBuildMonthDay","HWPartId","PowerLimit","LastAlarmCode"}; |
|
|
|
const char* const notAvail = "n/a"; |
|
|
|
|
|
|
@ -54,7 +54,7 @@ const byteAssign_fieldDeviceClass deviceFieldAssignment[] = { |
|
|
|
{FLD_PAC, DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT}, |
|
|
|
{FLD_F, DEVICE_CLS_FREQ, STATE_CLS_NONE}, |
|
|
|
{FLD_T, DEVICE_CLS_TEMP, STATE_CLS_MEASUREMENT}, |
|
|
|
{FLD_PCT, DEVICE_CLS_NONE, STATE_CLS_NONE}, |
|
|
|
{FLD_PFC, DEVICE_CLS_NONE, STATE_CLS_NONE}, |
|
|
|
{FLD_EFF, DEVICE_CLS_NONE, STATE_CLS_NONE}, |
|
|
|
{FLD_IRR, DEVICE_CLS_NONE, STATE_CLS_NONE} |
|
|
|
}; |
|
|
@ -206,7 +206,7 @@ const byteAssign_t hm4chAssignment[] = { |
|
|
|
{ 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_PFC, UNIT_PCT, CH0, 56, 2, 10 }, |
|
|
|
{ FLD_T, UNIT_C, CH0, 58, 2, 10 }, |
|
|
|
{ FLD_ALARM_MES_ID, UNIT_NONE, CH0, 60, 2, 1 }, |
|
|
|
{ FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, |
|
|
|