Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r46b16ef94cea2d5db25bfee08457686bc440de23 -rf1d684e536e7911b356a5d35320c909a1016d3d0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 46b16ef94cea2d5db25bfee08457686bc440de23)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      James Walter Taylor
-* @date    (last)      31-Mar-2023
+* @author  (last)      Sean Nash
+* @date    (last)      04-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -169,9 +169,9 @@
     dgIsCommunicating = TRUE;
     timeOfLastDGCheckIn = getMSTimerCount();
 
-    if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) )
+    if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_COMM_TIMEOUT ) )
     {
-        clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
+        clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
     }
 }
 
@@ -763,7 +763,7 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_HD_UI_COMM_TIMEOUT );
             }
         }
 
@@ -773,11 +773,11 @@
             // Only alarm on DG comm loss while in the treatment workflow
             if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
             {
-                activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_HD_DG_COMM_TIMEOUT );
             }
             else // Otherwise clear the alarm
             {
-                clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
+                clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
             }
             dgIsCommunicating = FALSE;
 #endif
@@ -908,11 +908,11 @@
                 memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
                 if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_HD_2_DG )
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
                 }
                 else
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_DG, (U32)msgID );
                 }
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
@@ -1745,6 +1745,10 @@
                 handleBloodPumpHardStopRequest( message );
                 break;
 
+            case MSG_ID_HD_ENABLE_VENOUS_BUBBLE_ALARM_DETECTION:
+                handleEnableVenousBubbleAlarmDetectionRequest( message );
+                break;
+
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore