Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r844f98879b7425c207b58562e623ab960adbc357 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 844f98879b7425c207b58562e623ab960adbc357)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file SystemComm.c
+* @file    SystemComm.c
 *
-* @author (last) Sean Nash
-* @date (last) 14-Oct-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Nov-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -57,7 +57,7 @@
 
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
-#define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Delanli messages that can be pending ACK at any given time
+#define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
 
 #pragma pack(push, 1)
 
@@ -195,7 +195,7 @@
 
     if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) )
     {
-        clearAlarm( ALARM_ID_DG_COMM_TIMEOUT );
+        clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
     }
 }
 
@@ -922,8 +922,10 @@
     if ( TRUE == uiDidCommunicate )
     {
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
-        {
-            activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+        {
+#ifndef DISABLE_UI_COMM_TO_ALARM
+            activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+#endif
         }
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
@@ -1146,18 +1148,10 @@
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_RO_PUMP_DATA:
-            handleROPumpData( message );
+        case MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+            handleDialysateFlowData( message );
             break;
 
-        case MSG_ID_DG_PRESSURES_DATA:
-            handleDGPressuresData( message );
-            break;
-
-        case MSG_ID_DRAIN_PUMP_DATA:
-            handleDrainPumpData( message );
-            break;
-
         case MSG_ID_DG_OP_MODE:
             handleDGOpMode( message );
             break;
@@ -1306,6 +1300,10 @@
             handleHDUsageInfoRequest( message );
             break;
 
+        case MSG_ID_HD_STOP_RTC_CLOCK:
+            handleStopHDRTCClock( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1417,14 +1415,6 @@
                 handleTestBloodPumpOcclusionOverrideRequest( message );
                 break;
 
-            case MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE:
-                handleTestDialysateInletPumpOcclusionOverrideRequest( message );
-                break;
-
-            case MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE:
-                handleTestDialysateOutletPumpOcclusionOverrideRequest( message );
-                break;
-
             case MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE:
                 handleTestPresOcclBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1523,12 +1513,12 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
-            case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestBloodFlowSignalStrengthOverrideRequest( message );
+            case MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE:
+                handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestDialInFlowSignalStrengthOverrideRequest( message );
+            case MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET:
+                handleHDSetArterialPressureOffsetRequest( message );
                 break;
 
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
@@ -1599,18 +1589,10 @@
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
-                handleBloodPrimeSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE:
                 handleRinsebackVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE:
-                handleRinsebackSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1779,6 +1761,14 @@
                 handleTestPostTreatmentModeSendIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE:
+                handleTestSyringePumpForceSensorCalibrateRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;