Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4fc093ea280a0bdb47c20d25efb7c840b9f9867a -r0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4fc093ea280a0bdb47c20d25efb7c840b9f9867a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500)
@@ -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
@@ -985,7 +985,7 @@
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+        case MSG_ID_DG_FLOW_SENSORS_DATA:
             handleDialysateFlowData( message );
             break;
 
@@ -1145,6 +1145,14 @@
             handleUIServiceModeRequest( message );
             break;
 
+        case MSG_ID_DG_SERVICE_SCHEDULE_DATA:
+            handleDGServiceScheduleData( message );
+            break;
+
+        case MSG_ID_DG_USAGE_DATA:
+            handleDGUsageInfoData( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );