Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3555f182983cb3852f1e414017d11aeb537d3274 -rd6b09c549d14f5f7fe08484bf0e882cadf2a892b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3555f182983cb3852f1e414017d11aeb537d3274)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d6b09c549d14f5f7fe08484bf0e882cadf2a892b)
@@ -869,7 +869,7 @@
         result = TRUE;
         memcpy( &payload, message->payload, sizeof( TARGET_TEMPS_PAYLOAD_T ) );
         setHeaterTargetTemperature( DG_PRIMARY_HEATER, payload.targetPrimaryHeaterTemp );
-        setHeaterTargetTemperature( DG_TRIMMER_HEATER, payload.targetTrimmerHeaterTemp );
+        //setHeaterTargetTemperature( DG_TRIMMER_HEATER, payload.targetTrimmerHeaterTemp ); // DEBUG_DENALI for treatment testing
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
@@ -1622,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 );
@@ -2465,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;
 
@@ -3711,6 +3718,27 @@
 
 /*********************************************************************//**
 * @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 handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
 * @details Inputs: none