Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rdaefaef0d2d3e13ff563f11d9721ccc1d831cf06 -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision daefaef0d2d3e13ff563f11d9721ccc1d831cf06)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -204,6 +204,10 @@
  *************************************************************************/
 void checkInFromUI( void )
 {
+    if ( FALSE == uiDidCommunicate )
+    {   // Start DG check-in timer when UI first communicates
+        timeOfLastDGCheckIn = getMSTimerCount();
+    }
     uiIsCommunicating = TRUE;
     timeOfLastUICheckIn = getMSTimerCount();
     uiDidCommunicate = TRUE;
@@ -930,11 +934,12 @@
         {
             activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
         }
+        if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+        {
+            activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+            dgIsCommunicating = FALSE;
+        }
     }
-    if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
-    {
-        dgIsCommunicating = FALSE;
-    }
 }
 
 /*********************************************************************//**
@@ -1179,6 +1184,14 @@
             handleTreatmentParametersFromUI( message );
             break;
 
+        case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
+            handleInitiateTreatmentRequest( message );
+            break;
+
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
             handleUIUserConfirmTreatmentParameters( message );
             break;
@@ -1187,6 +1200,10 @@
             handleChangePressureLimitsRequest( message );
             break;
 
+        case MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST:
+            handleHeparinCommandRequest( message );
+            break;
+
         case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
             handleUFVolumeSetRequest( message );
             break;
@@ -1236,7 +1253,7 @@
             break;
 
         default:
-            // TODO - unrecognized message ID received - ignore
+            // Unrecognized message ID received - ignore
             break;
     }
 
@@ -1482,8 +1499,40 @@
                 handleTestSuperClearAlarmsRequest( message );
                 break;
 
+            case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_OPERATION_REQUEST:
+                handleTestSyringePumpOperationRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_MEASURED_RATE_OVERRIDE:
+                handleTestSyringePumpMeasuredRateOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_MEASURED_FORCE_OVERRIDE:
+                handleTestSyringePumpMeasuredForceOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE:
+                handleTestSyringePumpMeasuredSyringeDetectOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE:
+                handleTestSyringePumpMeasuredHomeOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE:
+                handleTestSyringePumpMeasuredPositionOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE:
+                handleTestSyringePumpMeasuredVolumeOverrideRequest( message );
+                break;
+
             default:
-                // TODO - unrecognized message ID received - ignore
+                // Unrecognized message ID received - ignore
                 break;
         }
     }