Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2cc4f0cfc6512c942864d7d302cef5df375a2081 -rb01c6571b1ffade6de3e0bf6890de918f4d8b47d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b01c6571b1ffade6de3e0bf6890de918f4d8b47d)
@@ -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,7 +1184,7 @@
             handleTreatmentParametersFromUI( message );
             break;
 
-        case MSG_ID_UI_START_TREATMENT:
+        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleUIStartTreatmentMsg( message );
             break;
 
@@ -1191,6 +1196,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;
@@ -1462,6 +1471,38 @@
                 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
                 break;