Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r52d1378ccddcede0445ddb8a08fc1f70b9007b50 -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 52d1378ccddcede0445ddb8a08fc1f70b9007b50)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -26,8 +26,8 @@
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
+#include "ModeGenIdle.h"
 #include "ModeStandby.h"
-#include "ModeRecirculate.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -824,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 );
 }
@@ -1552,7 +1552,7 @@
         }
         else
         {
-            stopFillCmd();
+            //stopFillCmd();
         }
     }
 
@@ -1603,13 +1603,13 @@
 
         memcpy( &startingTreatment, message->payload, sizeof( U32 ) );
 
-        if ( DG_MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
+        if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( TRUE == startingTreatment ) )
         {
             result = requestDGStart();
         }
-        else if ( DG_MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
+        else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
-            result = requestDGStop();
+            //result = requestDGStop(); TODO uncomment this only for testing
         }
     }
 
@@ -1712,7 +1712,7 @@
 
         if ( TRUE == startingHeater )
         {
-            result = startPrimaryHeater();
+            result = startHeater( DG_PRIMARY_HEATER );
         }
         else
         {
@@ -2940,11 +2940,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( ( BOOL )payload.state.u32 )
         {
-            requestConcentratePumpsOn( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOn( ( CONCENTRATE_PUMPS_T )payload.index );
         }
         else
         {
-            requestConcentratePumpsOff( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOff( ( CONCENTRATE_PUMPS_T )payload.index );
         }
     }
 
@@ -3159,6 +3159,38 @@
 
 /*********************************************************************//**
 * @brief
+* The handleSetDGOpModeBroadcastIntervalOverrideRequest function handles a request
+* to override the publish interval of the DG operation mode.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDGOpModeBroadcastIntervalOverrideRequest( 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 = testSetDGOpModePublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetDGOpModePublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
 * The handleROPumpTargetPressureOverride function handles a request
 * to override the RO pump target pressure.
 * @details Inputs: none
@@ -3266,6 +3298,40 @@
 
 /*********************************************************************//**
 * @brief
+* The handleDGPOSTResultRequest function handles a request to report DG
+* POST results.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleDGPOSTResultRequest( MESSAGE_T *message )
+{
+    BOOL status = FALSE;
+    BOOL result = FALSE;
+    U08* payloadPtr = message->payload;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        if ( TRUE == isPOSTCompleted() )
+        {
+            status = TRUE;
+            if ( TRUE == isPOSTPassed() )
+            {
+                result = TRUE;
+            }
+            sendPOSTFinalResult( result );
+        }
+    }
+    // If can't respond to request, NAK the message
+    if ( status != TRUE )
+    {
+        sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+    }
+}
+
+/*********************************************************************//**
+* @brief
 * The handleSetDGCalibrationRecord function handles a request to set the DG
 * calibration data record.
 * @details Inputs: none