Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r740929e7f04220e1a74e1a6f8ce71129f40a7be1 -r5e8f96e11c797bddeddfc009c87f20df3b7a8664
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 740929e7f04220e1a74e1a6f8ce71129f40a7be1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e8f96e11c797bddeddfc009c87f20df3b7a8664)
@@ -7,15 +7,15 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      21-Sep-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      21-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
-#include <string.h>     // for memcpy()
+#include <string.h>        // for memcpy()
 
 #include "reg_system.h"
 
@@ -899,15 +899,16 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( message->hdr.payloadLen == sizeof( DG_SWITCH_RSRVRS_CMD_T ) )
     {
-        DG_RESERVOIR_ID_T reservoirID;
-        U32 resID;
+        DG_SWITCH_RSRVRS_CMD_T cmd;
 
+        memcpy( &cmd, message->payload, sizeof( DG_SWITCH_RSRVRS_CMD_T ) );
+
+        setActiveReservoirCmd( (DG_RESERVOIR_ID_T)cmd.reservoirID );
+        setTrimmerHeaterUseLastDutyCycleStatus( cmd.useLastTrimmerHeaterDC );
+
         result = TRUE;
-        memcpy( &resID, message->payload, sizeof( U32 ) );
-        reservoirID = (DG_RESERVOIR_ID_T)resID;
-        setActiveReservoirCmd( reservoirID );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -1044,7 +1045,7 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message )
+void handleHDStartStopTrimmerHeaterCmd( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -1282,6 +1283,41 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleDGStartStopTrimmerHeater function handles a request start or
+ * stop the trimmer heater
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleDGStartStopTrimmerHeater( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof( BOOL ) )
+    {
+        BOOL startingHeater;
+
+        memcpy( &startingHeater, message->payload, sizeof( BOOL ) );
+
+        if ( TRUE == startingHeater )
+        {
+            result = startHeater( DG_TRIMMER_HEATER );
+        }
+        else
+        {
+            stopHeater( DG_TRIMMER_HEATER );
+            result = TRUE;
+        }
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
+/*********************************************************************//**
 * @brief
 * The handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
@@ -2929,8 +2965,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
-
-
 /*********************************************************************//**
 * @brief
 * The handleGetDGCalibrationRecord function handles a request to get the DG
@@ -3337,6 +3371,7 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
 /*********************************************************************//**
 * The handleSetFansDutyCycleOverrideRequest function handles a
 * request to override the fans duty cycle.
@@ -3473,7 +3508,7 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestHDCommunicationStatusOverrideRequest(MESSAGE_T *message)
+void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -3530,6 +3565,101 @@
 }
 
 /*********************************************************************//**
+* The handleTestDGDrainPumpCurrentOverrideRequest function handles a
+* request to override the drain pump measured current.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestDGDrainPumpCurrentOverrideRequest( 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 = testSetDrainPumpMeasuredCurrentOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredCurrentOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* The handleTestDGDrainPumpDirectionOverrideRequest function handles a
+* request to override the drain pump measured direction.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestDGDrainPumpDirectionOverrideRequest( 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 = testSetDrainPumpMeasuredDirectionOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredDirectionOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* The handleTestDGValvesSensedStateOverrideRequest function handles a
+* request to override the valves sensed state.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestDGValvesSensedStateOverrideRequest( 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 = testSetValveSensedStateOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValveSensedStateOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetDGUsageInfoRecord function handles a request to get the DG
 * usage information record.
@@ -3724,4 +3854,163 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestDrainPumpMeasuredCurrentOverride function handles a request
+ * to override the drain pump measured current
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDrainPumpMeasuredCurrentOverride( 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 = testSetDrainPumpMeasuredCurrentOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredCurrentOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestGenIdlePublishIntervalOverride function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestGenIdlePublishIntervalOverride( 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 = testSetGenIdleSubstatesPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetGenIdleSubstatesPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGROPumpFeedbackVoltageOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGROPumpFeedbackVoltageOverrideRequest( 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 = testSetROPumpMeasuredFeedbackDutyCycleOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetROPumpMeasuredFeedbackDutyCycleOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGFillModeBroadcastOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGFillModeBroadcastOverrideRequest( 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 = testSetFillModeDataPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetFillModeDataPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+/*********************************************************************//**
+ * @brief
+ * The handleTestDGFillIntegratedVolumeOverrideRequest function handles a request
+ * to override the gen idle state publish interval
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDGFillIntegratedVolumeOverrideRequest( 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 = testSetIntegratedVolumeOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetIntegratedVolumeOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/