Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r92d1230313c92c7480b9ae80a37b7a594232f59d -r2bdae9629401e61c04fe84bb26c025fd689501c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 92d1230313c92c7480b9ae80a37b7a594232f59d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2bdae9629401e61c04fe84bb26c025fd689501c3)
@@ -263,17 +263,25 @@
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
     U32 e = (U32)event;
+    // Convert the two data types enums to U32. The enums are interpreted as a U08 by the compiler
+    U32 dataType1 = (U32)dat1.dataType;
+    U32 dataType2 = (U32)dat2.dataType;
 
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_EVENT;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( EVENT_DATA_T ) * 2;
+    // The payload length is the event ID, 2 event datas and the events data types for each of the event data
+    msg.hdr.payloadLen = sizeof( U32 ) + 2 * sizeof( EVENT_DATAS_T ) + 2 * sizeof( U32 );
 
     memcpy( payloadPtr, &e, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dat1, sizeof( EVENT_DATA_T ) );
-    payloadPtr += sizeof( EVENT_DATA_T );
-    memcpy( payloadPtr, &dat2, sizeof( EVENT_DATA_T ) );
+    memcpy( payloadPtr, &dataType1, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dat1.data, sizeof( EVENT_DATAS_T ) );
+    payloadPtr += sizeof( EVENT_DATAS_T );
+    memcpy( payloadPtr, &dataType2, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dat2.data, sizeof( EVENT_DATAS_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_NOT_REQUIRED );
@@ -503,33 +511,6 @@
 
 /*********************************************************************//**
  * @brief
- * The broadcastHeatersData function sends out DG heaters data
- * @details Inputs: none
- * @details Outputs: heaters data msg constructed and queued
- * @param heatersData which is the heaters data structure pointer
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastHeatersData ( HEATERS_DATA_T *heatersData )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA;
-    msg.hdr.payloadLen = sizeof( HEATERS_DATA_T );
-
-    memcpy( payloadPtr, heatersData, sizeof( HEATERS_DATA_T ) );
-
-    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The broadcastDrainPumpData function sends out the drain pump data.
  * @details Inputs: none
  * @details Outputs: Drain pump data msg constructed and queued
@@ -887,8 +868,8 @@
 
         result = TRUE;
         memcpy( &payload, message->payload, sizeof( TARGET_TEMPS_PAYLOAD_T ) );
-        setPrimaryHeaterTargetTemperature( payload.targetPrimaryHeaterTemp );
-        setTrimmerHeaterTargetTemperature( payload.targetTrimmerHeaterTemp );
+        setHeaterTargetTemperature( DG_PRIMARY_HEATER, payload.targetPrimaryHeaterTemp );
+        setHeaterTargetTemperature( DG_TRIMMER_HEATER, payload.targetTrimmerHeaterTemp );
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
@@ -1641,7 +1622,14 @@
         result = TRUE;
         memcpy( &drainCmd, message->payload, sizeof( DRAIN_CMD_T ) );
 
-        startDrainCmd( drainCmd );
+        if ( DG_CMD_START == drainCmd.cmd )
+        {
+            startDrainCmd( drainCmd );
+        }
+        else
+        {
+            stopDrainCmd();
+        }
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -1776,11 +1764,11 @@
 
         if ( TRUE == startingHeater )
         {
-            result = startPrimaryHeater();
+            result = startHeater( DG_PRIMARY_HEATER );
         }
         else
         {
-            stopPrimaryHeater();
+            stopHeater( DG_PRIMARY_HEATER );
             result = TRUE;
         }
     }
@@ -2329,14 +2317,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDrainPumpRPMOverrideRequest function handles a request to
- * override the drain pump speed set point (in RPM).
+ * The handleTestSetDrainPumpRPM function handles a request to set the drain
+ * pump speed set point (in RPM).
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message )
+void handleTestSetDrainPumpRPM( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -2484,14 +2472,14 @@
 
 /*************************************************************************
  * @brief
- * The handleSetDrainPumpDeltaPressureOverrideRequest function handles a
- * request to override the delta pressure for the drain pump.
+ * The handleSetDrainPumpTargetOutletPressure function handles a
+ * request to set the drain pump outlet pressure.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message )
+void handleSetDrainPumpTargetOutletPressure( MESSAGE_T *message )
 {
     BOOL result = 0;
 
@@ -2564,7 +2552,7 @@
         }
         else
         {
-            result = testResetSwitchesDataPublishIntervalOverrid();
+            result = testResetSwitchesDataPublishIntervalOverride();
         }
     }
 
@@ -3173,38 +3161,6 @@
 
 /*********************************************************************//**
 * @brief
-* The handleTestROFlowRateOverride function handles a request to override
-* the RO flow rate.
-* @details Inputs: none
-* @details Outputs: message handled
-* @param message a pointer to the message to handle
-* @return none
-*******************************************************************/
-void handleTestMeasuredROFlowRateOverride( 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 = testSetMeasuredROFlowRateOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetMeasuredROFlowRateOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
-* @brief
 * The handleTestThermistorsValueOverride function handles a request to
 * override a thermistor's value.
 * @details Inputs: none
@@ -3762,6 +3718,59 @@
 
 /*********************************************************************//**
 * @brief
+* The handleStopDGRTCClock function handles a request to stop the RTC clock.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleStopDGRTCClock( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        testSetStopRTC();
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetDrainPumpMeasuredRPMOverrideRequest function handles a request
+* to override the drain pump measured RPM.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDrainPumpMeasuredRPMOverrideRequest( 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 = testSetDrainPumpMeasuredRPMOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDrainPumpMeasuredRPMOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
 * The handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
 * @details Inputs: none