Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r992dce16d63424ddd30fe9ac2f819e9a53b21977 -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -22,6 +22,7 @@
 #include "Accel.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
+#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
@@ -215,6 +216,36 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastData function broadcasts data.
+ * @details Inputs: none
+ * @details Outputs: load cell data msg constructed and queued
+ * @param msgID message ID of the data is broadcast
+ * @param buffer comm buffer ID
+ * @param dataPtr pointer to the start of the buffer
+ * @param length length of the data buffer
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastData( MSG_ID_T msgID, COMM_BUFFER_T buffer, U08* dataPtr, U32 length )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = msgID;
+    msg.hdr.payloadLen = length;
+
+    memcpy( payloadPtr, dataPtr, length );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, buffer, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The broadcastAlarmTriggered function constructs an alarm triggered msg to
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
@@ -793,8 +824,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 );
 }
@@ -1521,7 +1552,7 @@
         }
         else
         {
-            stopFillCmd();
+            //stopFillCmd();
         }
     }
 
@@ -1578,7 +1609,7 @@
         }
         else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
-            result = requestDGStop();
+            //result = requestDGStop(); TODO uncomment this only for testing
         }
     }
 
@@ -1681,11 +1712,11 @@
 
         if ( TRUE == startingHeater )
         {
-            result = startPrimaryHeater();
+            result = startHeater( DG_PRIMARY_HEATER );
         }
         else
         {
-            stopPrimaryHeater();
+            stopHeater( DG_PRIMARY_HEATER );
             result = TRUE;
         }
     }
@@ -2405,7 +2436,7 @@
         }
         else
         {
-            result = testResetSwitchesDataPublishIntervalOverrid();
+            result = testResetSwitchesDataPublishIntervalOverride();
         }
     }
 
@@ -3603,6 +3634,37 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( 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 = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // 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.