Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rce659127f12060b21cb725240ff9ed919ab5f94d -receb190a5d66fdbee779478ac8bb50a846ed9241
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ce659127f12060b21cb725240ff9ed919ab5f94d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
@@ -8,21 +8,22 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Nov-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
-#include <string.h>     // for memcpy()
+#include <string.h>        // for memcpy()
 
 #include "reg_system.h"
 
 #include "Accel.h"
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
+#include "CPLD.h"
 #include "Fans.h"
 #include "FlowSensors.h"
 #include "FPGA.h"
@@ -831,6 +832,35 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleDGScheduledRunsRequest function handles a request for DG
+ * scheduled runs information.
+ * @details Inputs: none
+ * @details Outputs: message handled, response constructed and queued for
+ * transmit.
+ * @return none
+ *************************************************************************/
+void handleDGScheduledRunsRequest( MESSAGE_T *message )
+{
+    MESSAGE_T msg;
+    DG_SCHEDULED_RUN_RECORD_T scheduledService;
+
+    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SRR_RECORD, (U08*)&scheduledService, sizeof( DG_SCHEDULED_RUN_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_DG_SCHEDULED_RUNS_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+
+    // TODO this message is for Phase 1B.
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleStartStopDGFlush function handles a request to start or stop
 * DG flush mode.
@@ -1356,6 +1386,41 @@
 }
 
 /*********************************************************************//**
+* @brief
+* The handleStartStopDGChemicalDisinfectFlush function handles a request to start
+* or stop DG chemical disinfect flush mode.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+BOOL handleStartStopDGChemicalDisinfectFlush( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(BOOL) )
+    {
+        BOOL startingDGChemicalDisinfectFlush;
+
+        memcpy( &startingDGChemicalDisinfectFlush, message->payload, sizeof(BOOL) );
+
+        if ( TRUE == startingDGChemicalDisinfectFlush )
+        {
+            result = startDGChemicalDisinfectFlush();
+        }
+        else
+        {
+            result = stopChemicalDisinfectFlush();
+        }
+    }
+
+    // Respond to request
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
+/*********************************************************************//**
  * @brief
  * The handleTestSetOpModeRequest function handles a request to set the
  * DG operation mode.
@@ -1437,40 +1502,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleHDRequestDGUsageInfo function handles a request for DG
- * usage information.
- * @details Inputs: none
- * @details Outputs: message handled, response constructed and queued for
- * transmit.
- * @return none
- *************************************************************************/
-void handleHDRequestDGUsageInfo( MESSAGE_T * message )
-{
-    MESSAGE_T msg;
-    DG_USAGE_INFO_RECORD_T usageInfo;
-    U08 *payloadPtr = msg.payload;
-
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_DG_USAGE_DATA;
-    msg.hdr.payloadLen = sizeof( DG_USAGE_INFO_RECORD_T );
-
-    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
-    // has been already checked in POST
-    getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
-
-    if ( 0 == message->hdr.payloadLen )
-    {
-        // Fill message payload
-        memcpy( payloadPtr, &usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ) );
-    }
-
-    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleServiceModeRequest function handles a request to enter service
 * mode.
@@ -1510,6 +1541,40 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleHDRequestDGUsageInfo function handles a request for DG
+ * usage information.
+ * @details Inputs: none
+ * @details Outputs: message handled, response constructed and queued for
+ * transmit.
+ * @return none
+ *************************************************************************/
+void handleHDRequestDGUsageInfo( MESSAGE_T * message )
+{
+    MESSAGE_T msg;
+    DG_USAGE_INFO_RECORD_T usageInfo;
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_DG_USAGE_DATA;
+    msg.hdr.payloadLen = sizeof( DG_USAGE_INFO_RECORD_T );
+
+    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Fill message payload
+        memcpy( payloadPtr, &usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ) );
+    }
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendServiceModeResponse function sends out the DG response to a
  * UI request to go to service mode.
  * @details Inputs: none
@@ -1592,7 +1657,35 @@
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, status );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleCpldStatusRequest function handles a CPLD Status request message.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleCpldStatusRequest( MESSAGE_T *message )
+{
+    MESSAGE_T msg;
+    CPLD_STATUS_T payload;
+    U08 *payloadPtr = msg.payload;
 
+    // populate payload
+    getCPLDStatus( &payload );
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CPLD_STATUS;
+    msg.hdr.payloadLen = sizeof( CPLD_STATUS_T );
+
+    // fill message payload
+    memcpy( payloadPtr, &payload, sizeof( CPLD_STATUS_T ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
+}
+
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -4026,4 +4119,163 @@
    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, 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 );
+}
+
 /**@}*/