Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2b6abbe347b2da260a4d46aca233bbfb6a59bf04 -rba0b07893eccc26bda5d46281980c2e8cb499997
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2b6abbe347b2da260a4d46aca233bbfb6a59bf04)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ba0b07893eccc26bda5d46281980c2e8cb499997)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Oct-2022
+* @date    (last)      03-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -23,6 +23,7 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
+#include "CPLD.h"
 #include "Fans.h"
 #include "FlowSensors.h"
 #include "FPGA.h"
@@ -368,7 +369,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -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 );
@@ -2964,8 +2965,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
-
-
 /*********************************************************************//**
 * @brief
 * The handleGetDGCalibrationRecord function handles a request to get the DG
@@ -3147,37 +3146,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( 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 = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3316,10 +3284,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( 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 = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3342,7 +3341,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
@@ -3372,6 +3370,7 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
 /*********************************************************************//**
 * The handleSetFansDutyCycleOverrideRequest function handles a
 * request to override the fans duty cycle.
@@ -3508,7 +3507,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;
@@ -3565,6 +3564,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.
@@ -3668,30 +3762,6 @@
 
 /*********************************************************************//**
 * @brief
-* The handleResendAllAlarmsCommand function handles a request to re-send
-* all active DG alarms.
-* @details Inputs: none
-* @details Outputs: message handled
-* @param message a pointer to the message to handle
-* @return none
-*************************************************************************/
-void handleResendAllAlarmsCommand( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( 0 == message->hdr.payloadLen )
-    {
-        handleResendActiveAlarmsRequest();
-        result = TRUE;
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
-* @brief
 * The handleServiceModeRequest function handles a request to enter service
 * mode.
 * @details Inputs: none