Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6ba3eebfe02e3918402e30e0bd775bcfbcb06443 -r6483eb087eb474d9d670b25a1b023c38d27612b6
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6ba3eebfe02e3918402e30e0bd775bcfbcb06443)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6483eb087eb474d9d670b25a1b023c38d27612b6)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dong Nguyen
-* @date    (last)      27-Sep-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      11-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -46,7 +46,7 @@
 #define MAX_XMIT_RETRIES                5       ///< Maximum number of retries on no transmit complete interrupt timeout
 
 #define UI_COMM_TIMEOUT_IN_MS           5000    ///< UI has not checked in for this much time
-#define DG_COMM_TIMEOUT_IN_MS           2000    ///< DG has not checked in for this much time
+#define DG_COMM_TIMEOUT_IN_MS           1000    ///< DG has not checked in for this much time
 
 #define MAX_COMM_CRC_FAILURES           5       ///< Maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
@@ -981,13 +981,17 @@
 
         case MSG_ID_DG_VERSION:
             handleDGVersionResponse( message );
+            break;
+
+        case MSG_ID_DG_HEATERS_DATA:
+            handleDGHeatersData( message );
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+        case MSG_ID_DG_FLOW_SENSORS_DATA:
             handleDialysateFlowData( message );
             break;
 
@@ -1147,6 +1151,18 @@
             handleUIServiceModeRequest( message );
             break;
 
+        case MSG_ID_DG_SERVICE_SCHEDULE_DATA:
+            handleDGServiceScheduleData( message );
+            break;
+
+        case MSG_ID_DG_USAGE_DATA:
+            handleDGUsageInfoData( message );
+            break;
+
+        case MSG_ID_UI_CONFIRMATION_RESULT:
+            handleUIConfirmationResponse( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1360,6 +1376,10 @@
                 handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
 
+            case MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE:
+                handleHDDialInPumpRotorCountOverrideRequest( message );
+                break;
+
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;
@@ -1424,7 +1444,7 @@
                 handleTestSwitchesPublishIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
+            case MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE:
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;