Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r2830e6300c40e331b274511fa9183937810cc190 -r9ebe4663bc49e037ccd6287c265c45746a86c4ff
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2830e6300c40e331b274511fa9183937810cc190)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 9ebe4663bc49e037ccd6287c265c45746a86c4ff)
@@ -315,15 +315,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
+    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
     {
-        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
+        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? TRUE : FALSE );
 
         // Broadcast passed POST result
         sendPOSTTestResult( (DG_POST_STATE_T)((int)postState), passed );
         // Move on to next POST test
         result = (DG_POST_STATE_T)((int)postState + 1);
-        if ( SELF_TEST_STATUS_FAILED == testStatus )
+        if ( testStatus == SELF_TEST_STATUS_FAILED )
         {
             tempPOSTPassed = FALSE;
         }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2830e6300c40e331b274511fa9183937810cc190 -r9ebe4663bc49e037ccd6287c265c45746a86c4ff
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2830e6300c40e331b274511fa9183937810cc190)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9ebe4663bc49e037ccd6287c265c45746a86c4ff)
@@ -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
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r2830e6300c40e331b274511fa9183937810cc190 -r9ebe4663bc49e037ccd6287c265c45746a86c4ff
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2830e6300c40e331b274511fa9183937810cc190)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9ebe4663bc49e037ccd6287c265c45746a86c4ff)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      19-Oct-2022
+* @date    (last)      28-Oct-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -163,6 +163,15 @@
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_HD_OP_MODE
+BOOL handleSetHDOperationMode( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
+// MSG_ID_REQUEST_CPLD_STATUS
+void handleCpldStatusRequest( MESSAGE_T *message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -361,6 +370,12 @@
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
@@ -385,15 +400,18 @@
 // MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
 void handleSetPrimaryAndTrimmerHeatersTargetTemperature( MESSAGE_T *message );
 
+// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
+void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
+
+// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
+void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_USAGE_INFO_RECORD
 void handleSetDGUsageInfoRecord( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_DG_ALARMS
-void handleResendAllAlarmsCommand( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );
 
@@ -427,7 +445,6 @@
 // MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE
 void handleTestDGFillIntegratedVolumeOverrideRequest( MESSAGE_T *message );
 
-
 /**@}*/
 
 #endif