Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -rae1001d0076a70ae7a122fb827c6063c143bfc6a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ae1001d0076a70ae7a122fb827c6063c143bfc6a)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Feb-2022
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -784,7 +784,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -1137,22 +1137,25 @@
             handleHDUsageInfoRequest( message );
             break;
 
-        case MSG_ID_HD_STOP_RTC_CLOCK:
-            handleStopHDRTCClock( message );
-            break;
-
         case MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA:
             handleDGMixingRatios( message );
             break;
 
+        case MSG_ID_UI_REQUEST_SERVICE_MODE:
+            handleUIServiceModeRequest( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
 
+#ifndef _VECTORCAST_
+        // The default cannot be reached in VectorCAST since the cases are run in a for loop
         default:
             // Un-recognized or un-handled message ID received - ignore
-            break;
+            break;
+#endif
     }
 
     // Handle any test messages if tester has logged in successfully
@@ -1610,8 +1613,9 @@
                 handleTestSyringePumpForceSensorCalibrateRequest( message );
                 break;
 
-            case MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE:
-                handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
+            case MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET:
+                handleTestFansRPMAlarmStartTimeOffsetRequest( message );
+                break;
 
             case MSG_ID_HD_SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE:
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
@@ -1633,9 +1637,32 @@
                 handleSetHDSoftwareConfigRecord( message );
                 break;
 
+            case MSG_ID_HD_STOP_RTC_CLOCK:
+                handleStopHDRTCClock( message );
+                break;
+
+            case MSG_ID_HD_GET_USAGE_INFO_RECORD:
+                handleGetHDUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_USAGE_INFO_RECORD:
+                handleSetHDUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE:
+                handleSetBloodLeak2EmbeddedMode( message );
+                break;
+
+            case MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND:
+                handleSetBloodLeakEmbeddedModeCommand( message );
+                break;
+
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore
-                break;
+                break;
+#endif
         }
     }
 }