Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rfb1673d2282822995ed233f3e9ea5dfb0567780d -r4fc093ea280a0bdb47c20d25efb7c840b9f9867a
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision fb1673d2282822995ed233f3e9ea5dfb0567780d)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 4fc093ea280a0bdb47c20d25efb7c840b9f9867a)
@@ -96,13 +96,15 @@
 
 static DG_DISINFECT_UI_STATES_T disinfectsStatus;               ///< DG disinfects status.
 static DG_MIXING_RATIOS_T dgMixingRatios;                       ///< DG mixing ratios.
+static HEATERS_DATA_T dgHeatersData;                            ///< DG heaters data.
 
 // DG command response
 static DG_CMD_RESPONSE_T dgCmdResp[ NUM_OF_DG_COMMANDS ];       ///< Keep the latest DG command response for each command.
 
 // ********** private function prototypes **********
 
 static void checkDGRestart( void );
+static void checkDGTrimmerHeaterStatus( void );
 
 /*********************************************************************//**
  * @brief
@@ -184,6 +186,9 @@
 
     // Check to see if DG has restarted
     checkDGRestart();
+
+    // Check the status of the trimmer heater
+    checkDGTrimmerHeaterStatus();
 }
 
 /*********************************************************************//**
@@ -576,9 +581,22 @@
  *************************************************************************/
 void setDGMixingRatios( DG_MIXING_RATIOS_T ratios )
 {
-    memcpy( &dgMixingRatios, &ratios, sizeof(DG_MIXING_RATIOS_T) );
+    memcpy( &dgMixingRatios, &ratios, sizeof( DG_MIXING_RATIOS_T ) );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setDGHeatersData function sets heaters data that has been read from DG.
+ * @details Inputs: none
+ * @details Outputs: dgHeatersData
+ * @param data which is a pointer to the received heaters data
+ * @return none
+ *************************************************************************/
+void setDGHeatersData( HEATERS_DATA_T *data )
+{
+    memcpy( &dgHeatersData, data, sizeof( HEATERS_DATA_T ) );
+}
+
 /*********************************************************************//**
  * @brief
  * The cmdSetDGDialysateHeatingParams function sends the dialysate heating
@@ -1001,7 +1019,29 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The checkDGTrimmerHeaterStatus function checks to see the status of the
+ * trimmer heater and set them according to the status of the trimmer heater flag.
+ * @details Inputs: dgTrimmerHeaterOn
+ * @details Outputs: none
+ * @return none
+ *************************************************************************/
+static void checkDGTrimmerHeaterStatus( void )
+{
+    U32 trimmerState = dgHeatersData.trimmerHeaterState;
 
+    if ( ( TRUE == dgTrimmerHeaterOn ) && ( HEATER_EXEC_STATE_OFF == trimmerState ) )
+    {
+        cmdStartDGTrimmerHeater();
+    }
+    else if ( ( FALSE == dgTrimmerHeaterOn ) && ( trimmerState != HEATER_EXEC_STATE_OFF ) )
+    {
+        cmdStopDGTrimmerHeater();
+    }
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/