Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r353d01d31bc69d4d1901ff09097ee610bb1c9dbc -ra3960210792d0811093a6913e505d43eda1918ea
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 353d01d31bc69d4d1901ff09097ee610bb1c9dbc)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision a3960210792d0811093a6913e505d43eda1918ea)
@@ -35,7 +35,6 @@
 
 #define MAX_RESERVOIR_VOLUME_ML         2000            ///< Maximum reservoir volume in mL.
 
-#pragma pack(push,1)
 /// Fill command data structure.
 typedef struct
 {
@@ -47,10 +46,10 @@
 /// Drain command data structure.
 typedef struct
 {
-    U32 targetVolume;               ///< Target volume to drain to (in mL)
+    U32  targetVolume;              ///< Target volume to drain to (in mL)
     BOOL tareLoadCell;              ///< Flag to tare load call
     BOOL rinseConcentrateLines;     ///< Flag indicates to rinse concentrate lines or not
-    U32 cmd;                        ///< General command (start/stop)
+    U32  cmd;                       ///< General command (start/stop)
 } DRAIN_CMD_T;
 
 /// DG command response data record.
@@ -61,15 +60,31 @@
     U32 rejectCode;             ///< Reason code for rejecting the command
 } DG_CMD_RESPONSE_T;
 
+// TODO add doxygen comments
+/// Dialysate heating parameters
+typedef struct
+{
+    F32 trimmerTargetTemperature;
+    U32 timeReservoirCycleMS;
+    F32 timeReservoirFillMS;
+    U32 timeReservoirWait2SwitchMS;
+    F32 dialysateFlowLPM;
+} DG_CMD_DIALYSATE_HEATING_PARAMS_T;
+
 /// Reservoir data struct.
 typedef struct
 {
     U32 activeReservoir;        ///< Active reservoir ID
     U32 fillToVolumeMl;         ///< Volume target to fill to
     U32 drainToVolumeMl;        ///< Volume target to drain to
+    U32 timeReservoirCycleMS;
+    U32 timeReservoirFill2SwitchMS;
+    F32 timeUFDecayMS;
+    F32 tempUFFill;
+    F32 tempReservoirStartFill;
+    F32 tempReservoirEndFill;
 } RESERVOIR_DATA_T;
-#pragma pack(pop)
-
+
 // ********** public function prototypes **********
 
 void initReservoirs( void );
@@ -91,9 +106,10 @@
 F32  getReservoirWeight( DG_RESERVOIR_ID_T reservoirId );
 
 // Heaters target temperature function prototype
-void setHeatersTargetTemperature( TARGET_TEMPS_AND_TIME_PAYLOAD_T targets );
+void setHeatersTargetTemperature( DG_CMD_DIALYSATE_HEATING_PARAMS_T params );
 U32  getTargetFillVolumeML( void );
 F32  getTargetFillFlowRateLPM( void );
+F32  getReservoirActualTemperature( void );
 
 DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void );