diff --git a/src/hm/hmDefines.h b/src/hm/hmDefines.h
index 4287d26e..a6dcb083 100644
--- a/src/hm/hmDefines.h
+++ b/src/hm/hmDefines.h
@@ -189,21 +189,21 @@ const byteAssign_t AlarmDataAssignment[] = {
 //-------------------------------------
 const byteAssign_t hm1chAssignment[] = {
     { 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_IDC, UNIT_A,    CH1,  6, 2, 100  },
+    { FLD_PDC, UNIT_W,    CH1, 10, 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_MP,  UNIT_W,    CH1, CALC_MPDC_CH, CH1, CMD_CALC },
 
-    { 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_Q,   UNIT_VAR,  CH0, 20, 2, 10   },
-    { FLD_F,   UNIT_HZ,   CH0, 16, 2, 100  },
-    { FLD_PF,  UNIT_NONE, CH0, 24, 2, 1000 },
-    { FLD_T,   UNIT_C,    CH0, 26, 2, 10   },
-    { FLD_EVT, UNIT_NONE, CH0, 28, 2, 1    },
+    { 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_Q,   UNIT_VAR,  CH0, 40, 2, 10   },
+    { FLD_F,   UNIT_HZ,   CH0, 28, 2, 100  },
+    { FLD_PF,  UNIT_NONE, CH0, 36, 2, 1000 },
+    { FLD_T,   UNIT_C,    CH0, 38, 2, 10   },
+    { FLD_EVT, UNIT_NONE, 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 },
@@ -220,15 +220,15 @@ const byteAssign_t hm1chAssignment[] = {
 //-------------------------------------
 const byteAssign_t hm2chAssignment[] = {
     { 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_IDC, UNIT_A,    CH1,  6, 2, 100  },
+    { FLD_PDC, UNIT_W,    CH1, 10, 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_MP,  UNIT_W,    CH1, CALC_MPDC_CH, CH1, CMD_CALC },
 
-    { FLD_UDC, UNIT_V,    CH2,  8, 2, 10   },
-    { FLD_IDC, UNIT_A,    CH2, 10, 2, 100  },
+    { FLD_UDC, UNIT_V,    CH2,  4, 2, 10   },
+    { FLD_IDC, UNIT_A,    CH2,  8, 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 },