Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -ra727129f5f547fc7a46f481417f7b926454d3e97 -r0803f828b81e046166457564650acf6a9bbd3cc6
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a727129f5f547fc7a46f481417f7b926454d3e97)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 0803f828b81e046166457564650acf6a9bbd3cc6)
@@ -198,7 +198,7 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCompleteState( void );
 
 static void failHeatDisinfect( void );
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout );
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T reservoir, F32 targetVol, U32 timeout );
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout );
 static HEAT_DISINFECT_STATUS_T getHeatDisinfectStatus( void );
 static void publishHeatDisinfectData( void );
@@ -437,24 +437,23 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectStartState( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_DRAIN_R1;
+    F32 ppiPressure                 = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
+    F32 TDiTemp                     = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+    F32 TRoTemp                     = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
 
     // Start overall heat disinfect timer
     overallHeatDisinfectTimer = getMSTimerCount();
 
     // Set all the actuators to reset and de-energized state
     deenergizeActuators();
 
-    F32 ppiPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
-    F32 TDiTemp     = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
-    F32 TRoTemp     = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
-
     // If the inlet pressure is less than the threshold and TDi and TRo difference is greater than 3 C, the cycle
     // should be canceled
     if ( ( ppiPressure < MIN_INLET_PRESSURE_PSI ) && ( fabs( TDiTemp - TRoTemp ) > MAX_START_STATE_TEMP_SENSORS_DIFF_C ) )
     {
-        prevHeatDisinfectState = state;
+        prevHeatDisinfectState      = state;
         alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT;
-        state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                       = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
     else
     {
@@ -1556,11 +1555,13 @@
     // First reservoir 2 must be completely full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
+        // Keep monitoring the status of reservoir 1 as the same time
+        F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+
         rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
-        // Keep monitoring the status of reservoir 1 as the same time
-        F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+
         // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already
         // reached to target volume, it means reservoir 2's load cell might be reading incorrect values. This situation might continue
         // until reservoir 1 is filled up and the tubing might expand or leak.
@@ -1695,14 +1696,12 @@
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {
         U32 targetRPM = 0;
+        F32 TDi       = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+        F32 TRo       = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
 
         // Stop all the actuators first then decide who should run next
         deenergizeActuators();
 
-        // Check inlet dialysate and redundant outlet temperature sensors
-        F32 TDi = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
-        F32 TRo = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
-
         // The two sensors must be less than a threshold to decide if mix drain is needed to normal drain
         if ( ( TDi < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) && ( TRo < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) )
         {
@@ -1825,27 +1824,27 @@
  * complete and exits the heat disinfect mode.
  * @details Inputs: rsrvrFillStableTimeCounter, alarm, stateTimer
  * @details Outputs: none
- * @param r is DG_RESERVOIR_1 or DG_RESERVOIR_2
+ * @param reservoir is DG_RESERVOIR_1 or DG_RESERVOIR_2
  * @param targetVol is the target fill volume
  * @param timeout is the fill up timeout
  * @return the status of the reservoirs during filling
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout )
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T reservoir, F32 targetVol, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 volume = 0.0;
 
-    if ( r == DG_RESERVOIR_1 )
+    if ( DG_RESERVOIR_1 == reservoir )
     {
         volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
-    else if ( r == DG_RESERVOIR_2 )
+    else if ( DG_RESERVOIR_2 == reservoir )
     {
         volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED, r )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED, reservoir )
     }
 
     // Check the volume of the reservoir against the target volume
@@ -2103,6 +2102,7 @@
             // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
             // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
             U32 cap                     = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP );
+
             prevHeatDisinfectState      = heatDisinfectState;
             heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
             alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;