Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r9a0cebb3cec7e68af87d9d2f8bea747d0543b479 -r2991b6731ff88740f29ea2f19411115d4f8a4aa4
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 9a0cebb3cec7e68af87d9d2f8bea747d0543b479)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 2991b6731ff88740f29ea2f19411115d4f8a4aa4)
@@ -62,7 +62,7 @@
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
 static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
 static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn = FALSE;                          ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // State machine states
 static U32 timeStartMS = 0; // TODO is this needed?
@@ -111,13 +111,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
@@ -141,26 +143,26 @@
     dgCurrentOpMode                 = DG_MODE_INIT;
     dgSubMode                       = 0;
     dgStartCommandSent              = FALSE;
-    dgDialysateFlowRateMlMin        = 0.0;
+    dgDialysateFlowRateMlMin        = 0.0F;
     dgDialysateFlowDataFreshFlag    = FALSE;
 
     // initialize load cell weights
     for ( i = 0; i < NUM_OF_LOAD_CELLS; i++ )
     {
-        loadCellWeightInGrams[ i ].data       = 0.0;
-        loadCellWeightInGrams[ i ].ovInitData = 0.0;
-        loadCellWeightInGrams[ i ].ovData     = 0.0;
+        loadCellWeightInGrams[ i ].data       = 0.0F;
+        loadCellWeightInGrams[ i ].ovInitData = 0.0F;
+        loadCellWeightInGrams[ i ].ovData     = 0.0F;
         loadCellWeightInGrams[ i ].override   = 0;
     }
     // initialize reservoirs weights
     for ( i = 0; i < NUM_OF_DG_RESERVOIRS; i++ )
     {
-        lgFilteredReservoirWeightInGrams[ i ] = 0.0;
+        lgFilteredReservoirWeightInGrams[ i ] = 0.0F;
 
         for ( j = 0; j < SIZE_OF_LARGE_LOAD_CELL_AVG; j++ )
         {
-            lgLoadCellReadings[ i ][ j ]       = 0.0;
-            lgLoadCellBackupReadings[ i ][ j ] = 0.0;
+            lgLoadCellReadings[ i ][ j ]       = 0.0F;
+            lgLoadCellBackupReadings[ i ][ j ] = 0.0F;
         }
     }
 
@@ -173,10 +175,10 @@
     }
 
     lgLoadCellReadingsIdx                           = 0;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ]       = 0.0;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ]       = 0.0;
-    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0;
-    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0;
+    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ]       = 0.0F;
+    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ]       = 0.0F;
+    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F;
+    lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F;
 
     initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_HIGH_SAFETY_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS, DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS );
@@ -242,8 +244,12 @@
     // Trigger alarm if not receiving new reservoirs data message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
-    // Check to see if DG has restarted
-    checkDGRestart();*/
+    // Check to see if DG has restarted*/
+
+    checkDGRestart();
+
+    // Check the status of the trimmer heater
+    checkDGTrimmerHeaterStatus();
 }
 
 /*********************************************************************//**
@@ -712,9 +718,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
@@ -1110,15 +1129,6 @@
     F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
     BOOL isTDiTempBelowDialysateTarget = ( TDiLow >= dgDialysateTemp ? TRUE : FALSE );
 
-    /*BOOL const dialysateHighTemp = ( ( ( dgDialysateTemp - dgTrimmerTempSet ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
-                                     ( dgDialysateTemp > DIALYSATE_TEMP_HIGH_LIMIT_C ) );
-
-    BOOL const dialysateLowTemp = ( ( ( dgTrimmerTempSet - dgDialysateTemp ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
-                                    ( dgDialysateTemp < DIALYSATE_TEMP_LOW_LIMIT_C ) );
-
-    BOOL const dialysateTempRecovered = fabs( dgDialysateTemp - dgTrimmerTempSet ) < DIALYSATE_TEMP_RECOVERY_TOLERANCE_C ? TRUE : FALSE;
-
-
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -1129,16 +1139,6 @@
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
     }
-        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
-        {
-            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
-        }
-
-        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
-        {
-            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
-        }
-    }*/
 }
 
 // ********** private functions **********
@@ -1169,7 +1169,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
  *************************************************************************/