Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
@@ -8,7 +8,7 @@
 * @file    Heaters.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      05-May-2022
+* @date    (last)      21-Jun-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  23-Apr-2020
@@ -46,7 +46,7 @@
 typedef struct
 {
     BOOL startHeater;                       ///< Flag indicates start or stop heater
-    F32 targetTemp;                         ///< Target temperature for heater
+    F32 targetTemp;                         ///< Target temperature for heater  // TODO remove and its counterpart in HD
 } TRIMMER_HEATER_CMD_T;
 
 /// Heaters data structure.
@@ -60,17 +60,15 @@
     U32 primaryHeaterState;                 ///< Primary heater state
     U32 trimmerHeaterState;                 ///< Trimmer heater state
     F32 primaryEfficiency;                  ///< Primary heater efficiency
-
-    F32 dialysateTargetLPM;                 ///< TODO remove this variable later
-    F32 interimTargetTemp;                  ///< TODO remove this variable later
-    F32 targetHeaterFlowLPM;                ///< TODO remove this variable later
+    F32 primaryCalcTargetTemp;              ///< Primary heater calculated target temperature
+    F32 trimmerCalcCurrentTemp;             ///< Trimmer heater calculated current temperature
 } HEATERS_DATA_T;
 
 // ********** Public function prototypes **********
 
 void initHeaters( void );
 
-void setHeaterTargetTemperature( DG_HEATERS_T heater, F32 targetTemperature );
+BOOL setHeaterTargetTemperature( DG_HEATERS_T heater, F32 targetTemperature );
 
 BOOL startHeater( DG_HEATERS_T heater );
 
@@ -80,8 +78,6 @@
 
 void execHeaters( void );
 
-void handleTrimmerHeaterCmd( TRIMMER_HEATER_CMD_T *heaterCmdPtr ); // handle trimmer heater control command from HD
-
 void execHeatersMonitor( void );
 
 void resetHeatersEfficiency( void );