Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc6d02ee52040e350a4711e91ffc79196a6fbb099 -r4b528a5706b6d1c8661b00dcd45c39cf8db9a0f6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c6d02ee52040e350a4711e91ffc79196a6fbb099)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4b528a5706b6d1c8661b00dcd45c39cf8db9a0f6)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      10-Aug-2023
+* @author  (last)      Sean Nash
+* @date    (last)      24-Aug-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -28,6 +28,7 @@
 #include "FlowSensors.h"
 #include "FPGA.h"
 #include "Heaters.h"
+#include "Integrity.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeChemicalDisinfectFlush.h"
 #include "ModeDrain.h"
@@ -340,7 +341,7 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U32 ) * 5;
+    msg.hdr.payloadLen = sizeof( U32 ) * 8;
 
     memcpy( payloadPtr, &alarm, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
@@ -1131,6 +1132,27 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleParkConecentratePumpsCmd function handles a DG concentrate pumps park
+ * command message from the HD.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleParkConecentratePumpsCmd( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == 0 )
+    {
+        result = handleConcentratePumpParkRequest();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleStartStopTrimmerHeaterCmd function handles a trimmer heater start/stop
  * command message from the HD.
  * @details Inputs: none
@@ -1550,9 +1572,9 @@
         U32 mode    = 0;
         U32 subMode = 0;
 
-        memcpy( payloadPtr, &mode, sizeof( U32 ) );
+        memcpy( &mode, payloadPtr, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &subMode, sizeof( U32 ) );
+        memcpy( &subMode, payloadPtr, sizeof( U32 ) );
 
         setHDOperationMode( mode, subMode );
         status = TRUE;
@@ -4938,7 +4960,7 @@
 
     if ( 0 == message->hdr.payloadLen )
     {
-        roMode = isROOnlyModeEnabled()
+        roMode = isROOnlyModeEnabled();
     }
     else
     {
@@ -4947,4 +4969,100 @@
     sendUIResponseMsg( MSG_ID_DG_RO_ONLY_MODE_STATUS_RESPONSE, roMode, rejReason );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestHDRAMStatusOverrideRequest function handles a request to
+ * override the RAM status register.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGRAMStatusOverrideRequest( MESSAGE_T* message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetRAMStatusOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetRAMStatusOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGPendingACKOverrideRequest 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 handleTestDGPendingACKOverrideRequest( 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 );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGReservoirOverrideRequest function handles a request
+ * to override the reservoir publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGReservoirOverrideRequest( 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 = testSetReservoirDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetReservoirDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/