Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r666d17245e2873e847cdf0b1da07abfe0702523e -rc6d4cd2dbaac8a68be80b047f8fb0a33133576af
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 666d17245e2873e847cdf0b1da07abfe0702523e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c6d4cd2dbaac8a68be80b047f8fb0a33133576af)
@@ -348,41 +348,10 @@
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
 
     return result;
-}
+}
 
 /*********************************************************************//**
  * @brief
- * The broadcastDGHDOperationMode function constructs a DG operation mode
- * broadcast message and queues the msg for transmit on the appropriate CAN channel.
- * @details Inputs: none
- * @details Outputs: DG operation mode msg constructed and queued
- * @param mode current operation mode of the DG.
- * @param subMode current sub-mode of the current operation mode of the DG.
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastDGOperationMode( U32 mode, U32 subMode )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_OP_MODE;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
-
-    memcpy( payloadPtr, &mode, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &subMode, sizeof( U32 ) );
-
-    // 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 broadcastLoadCellData function sends out load cell data.
  * @details Inputs: none
  * @details Outputs: load cell data msg constructed and queued
@@ -539,104 +508,6 @@
 
 /*********************************************************************//**
  * @brief
- * The broadcastLoadCellData function sends out load cell data.
- * @details Inputs: none
- * @details Outputs: load cell data msg constructed and queued
- * @param loadCellA1 load cell A 1 data in grams
- * @param loadCellA2 load cell A 2 data in grams
- * @param loadCellB1 load cell B 1 data in grams
- * @param loadCellB2 load cell B 2 data in grams
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    LOAD_CELL_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_LOAD_CELL_READINGS;
-    msg.hdr.payloadLen = sizeof( LOAD_CELL_DATA_T );
-
-    payload.loadCellA1inGram = loadCellA1;
-    payload.loadCellA2inGram = loadCellA2;
-    payload.loadCellB1inGram = loadCellB1;
-    payload.loadCellB2inGram = loadCellB2;
-
-    memcpy( payloadPtr, &payload, sizeof( LOAD_CELL_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 broadcastValvesStates function sends out DG valves states.
- * @details Inputs: none
- * @details Outputs: Valves states msg constructed and queued
- * @param valvesStates valves states
- * refer to setFPGAValveStates function in FPGA.c for details
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastValvesStates( U16 valvesStates )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_VALVES_STATES;
-    msg.hdr.payloadLen = sizeof( U16 );
-
-    memcpy( payloadPtr, &valvesStates, sizeof( U16 ) );
-
-    // 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 broadcastHeatersData function sends out DG heaters data
- * @details Inputs: heaters data
- * @details Outputs: heatears data msg constructed and queued
- * @param mainPrimaryDC main primary heater duty cycle
- * @param smallPrimaryDC small primary heater duty cycle
- * @param trimmerDC trimmer heater duty cycle
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    HEATERS_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA;
-    msg.hdr.payloadLen = sizeof( HEATERS_DATA_T );
-
-    payload.mainPrimayHeaterDC = mainPrimaryDC;
-    payload.smallPrimaryHeaterDC = smallPrimaryDC;
-    payload.trimmerHeaterDC = trimmerDC;
-
-    memcpy( payloadPtr, &payload, 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 broadcastROPumpData function sends out RO pump data.
  * @details Inputs: none
  * @details Outputs: RO pump data msg constructed and queued
@@ -671,38 +542,6 @@
 
 /*********************************************************************//**
  * @brief
- * The broadcastDrainPumpData function sends out drain pump data.
- * @details Inputs: none
- * @details Outputs: Drain pump data msg constructed and queued
- * @param tgtSpeed target speed for drain pump in RPM
- * @param dac set DAC value
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    DRAIN_PUMP_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DRAIN_PUMP_DATA;
-    msg.hdr.payloadLen = sizeof( DRAIN_PUMP_DATA_T );
-
-    payload.setDrainPumpSpeed = tgtSpeed;
-    payload.dacValue = dac;
-
-    memcpy( payloadPtr, &payload, sizeof( DRAIN_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 broadcastConcentratePumpData function sends out concentrate pumps' data.
  * @details Inputs: none
  * @details Outputs: concentrate pump data msg constructed and queued