Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4828ff8bd5b5ff97f36de33101d8ca4b9e54bfa1 -r23fd84a12113578bb1d86fdfbc86701494a35cf1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4828ff8bd5b5ff97f36de33101d8ca4b9e54bfa1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 23fd84a12113578bb1d86fdfbc86701494a35cf1)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      15-Aug-2023
+* @date    (last)      25-Aug-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -2115,25 +2115,22 @@
  *************************************************************************/
 void handleAlarmTriggered( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == ( sizeof( U32 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
+    if ( message->hdr.payloadLen == sizeof( ALARM_TRIGGERED_PAYLOAD_T ) )
     {
+        ALARM_TRIGGERED_PAYLOAD_T payload;
         U08 *payloadPtr = message->payload;
-        U32 alarmID;
-        ALARM_DATA_T alm1, alm2;
 
-        memcpy( &alarmID, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.data, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.data, payloadPtr, sizeof( U32 ) );
+        memcpy( &payload, payloadPtr, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
 
-        if ( (ALARM_ID_T)alarmID < NUM_OF_ALARM_IDS )
+        if ( (ALARM_ID_T)(payload.alarm) < NUM_OF_ALARM_IDS )
         {
-            activateAlarm2Data( (ALARM_ID_T)alarmID, alm1, alm2 );
+            ALARM_DATA_T alm1, alm2;
+
+            alm1.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType1);
+            alm1.data.uInt.data = payload.almData1;
+            alm2.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType2);
+            alm2.data.uInt.data = payload.almData2;
+            activateAlarm2Data( (ALARM_ID_T)(payload.alarm), alm1, alm2, TRUE );
         }
     }
 }
@@ -4405,20 +4402,20 @@
  *************************************************************************/
 void handleTestArterialPressureOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetArterialPressureOverride( payload.state.f32 );
+            result = testSetArterialPressureOverride( payload.state.f32, payload.index );
         }
         else
         {
-            result = testResetArterialPressureOverride();
+            result = testResetArterialPressureOverride( payload.index );
         }
     }
 
@@ -4437,20 +4434,20 @@
  *************************************************************************/
 void handleTestVenousPressureOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetVenousPressureOverride( payload.state.f32 );
+            result = testSetVenousPressureOverride( payload.state.f32, payload.index );
         }
         else
         {
-            result = testResetVenousPressureOverride();
+            result = testResetVenousPressureOverride( payload.index );
         }
     }
 
@@ -6225,7 +6222,6 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
-#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -6239,7 +6235,6 @@
             result = testResetValvesCurrentOverride( payload.index );
         }
     }
-#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -8357,11 +8352,8 @@
  *************************************************************************/
 void handleTestHDDialinCheckIn( MESSAGE_T* message )
 {
-    BOOL status = FALSE;
-
     if ( 0 == message->hdr.payloadLen )
     {
-        status = TRUE;
         setDialinCheckInTimeStamp();
     }
 }
@@ -8455,4 +8447,36 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestHDPendingACKOverrideRequest function handles a
+ * request to override pending ACKs.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestHDPendingACKOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetPendingACKOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetPendingACKOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/