Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rba4d9696d4c0ac731775e0bcc5a7e50f65c90285 -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ba4d9696d4c0ac731775e0bcc5a7e50f65c90285)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
@@ -500,33 +500,6 @@
     return result;
 }
 
-/*********************************************************************//**
- * @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.
@@ -616,35 +589,6 @@
 
 /*********************************************************************//**
  * @brief
- * The broadcastConcentratePumpData function sends out concentrate pumps' data.
- * @details Inputs: none
- * @details Outputs: concentrate pump data msg constructed and queued
- * @param cp1TgtSpeed target speed for concentrate pump CP1
- * @param measuredCP1Speed measured speed for concentrate pump CP1 using hall sense
- * @param cp2TgtSpeed target speed for concentrate pump CP2
- * @param measuredCP2Speed measured speed for concentrate pump CP2 using hall sense
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr )
-{
-    BOOL result;
-    MESSAGE_T msg;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_CONCENTRATE_PUMP_DATA;
-    msg.hdr.payloadLen = sizeof( CONCENTRATE_PUMP_DATA_T );
-
-    memcpy( &msg.payload, concentratePumpDataPtr, sizeof( CONCENTRATE_PUMP_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 broadcastPressureSensorsData function sends out DG pressure data.
  * @details Inputs: none
  * @details Outputs: Pressure data msg constructed and queued
@@ -860,8 +804,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 );
 }
@@ -1588,7 +1532,7 @@
         }
         else
         {
-            stopFillCmd();
+            //stopFillCmd();
         }
     }
 
@@ -1645,7 +1589,7 @@
         }
         else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
-            result = requestDGStop();
+            //result = requestDGStop(); TODO uncomment this only for testing If DG by itself is run, a stop request is sent since HD is may not be available
         }
     }
 
@@ -1748,11 +1692,11 @@
 
         if ( TRUE == startingHeater )
         {
-            result = startPrimaryHeater();
+            result = startHeater( DG_PRIMARY_HEATER );
         }
         else
         {
-            stopPrimaryHeater();
+            stopHeater( DG_PRIMARY_HEATER );
             result = TRUE;
         }
     }
@@ -2472,7 +2416,7 @@
         }
         else
         {
-            result = testResetSwitchesDataPublishIntervalOverrid();
+            result = testResetSwitchesDataPublishIntervalOverride();
         }
     }
 
@@ -3081,38 +3025,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