Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r7499a42cc0f906f9a4a947c82c5b4615217ce7e5 -r5eeb53520a752289b0e2efab8e600044c454437e
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 7499a42cc0f906f9a4a947c82c5b4615217ce7e5)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5eeb53520a752289b0e2efab8e600044c454437e)
@@ -8,7 +8,7 @@
 * @file    Dialysis.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @date    (last)      15-Jul-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -52,6 +52,14 @@
 
 #define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0F                           ///< Maximum delta between new and previous measured UF volume.
 
+/// Defined states for the Load Cell cycles.
+typedef enum Reservoir_Steady_Cycle
+{
+    RESERVOIR_STEADY_CYCLE_START = 0,           ///< Reservoir steady cycle load cell reading at Start
+    RESERVOIR_STEADY_CYCLE_FINAL,               ///< Reservoir steady cycle load cell reading at Final
+    NUM_OF_RESERVOIR_STEADY_CYCLES              ///< Number of Reservoir steady cycle load cell readings
+} RESERVOIR_STEADY_CYCLE_T;
+
 // ********** private data **********
 
 static DIALYSIS_STATE_T currentDialysisState;           ///< Current state of the dialysis sub-mode state machine.
@@ -65,7 +73,7 @@
 static F32 resCurrVolume[ NUM_OF_DG_RESERVOIRS ];       ///< Reservoir current volume.
 static F32 resLastVolume[ NUM_OF_DG_RESERVOIRS ];       ///< Reservoir previous volume.
 static F32 measUFVolumeFromPriorReservoirs;             ///< Current total ultrafiltration volume from previous reservoirs in current treatment.
-static F32 lcLastSteadyWeight[NUM_OF_LOAD_CELLS];        ///< Load Cell Last Steady Weight for drift test
+static F32 lcLastSteadyWeight[NUM_OF_RESERVOIR_STEADY_CYCLES][NUM_OF_LOAD_CELLS];    ///< Load Cell Last Steady Weight for drift test Start/Final cycle
 
 static U32 uFTimeMS;                                    ///< Current elapsed ultrafiltration time (in ms).  Used for calculating UF reference volume.
 static U32 lastUFTimeStamp;                             ///< HD timer value when we last took stock of ultrafiltration time (so we can determine how much time has elapsed since).
@@ -107,7 +115,7 @@
 static void updateUFVolumes( void );
 
 static void publishSalineBolusData( void );
-static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID );
+static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, RESERVOIR_STEADY_CYCLE_T cycle );
 
 /*********************************************************************//**
  * @brief
@@ -148,7 +156,8 @@
 
     for (i=0; i<NUM_OF_LOAD_CELLS; i++)
     {
-        lcLastSteadyWeight[i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
+        lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
+        lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
     }
     resetSalineBolus();
 }
@@ -194,6 +203,8 @@
 {
     PUMP_CONTROL_MODE_T mode = PUMP_CONTROL_MODE_CLOSED_LOOP;
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Set last UF timestamp so UF ref is resumed from this time
     lastUFTimeStamp = getMSTimerCount();
     // Send dialysate outlet pump latest UF volumes
@@ -1146,7 +1157,7 @@
     resStartVolume[ reservoirID ] = resVolume;
     resFinalVolume[ reservoirID ] = resVolume;
 
-    checkLoadCellsStablePrimaryBackupDriftOutOfRange( reservoirID );
+    checkLoadCellsStablePrimaryBackupDriftOutOfRange( reservoirID, RESERVOIR_STEADY_CYCLE_START );
 }
 
 /*********************************************************************//**
@@ -1185,7 +1196,7 @@
     resFinalVolume[ inactiveRes ] = resVolume;
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );
 
-    checkLoadCellsStablePrimaryBackupDriftOutOfRange( inactiveRes );
+    checkLoadCellsStablePrimaryBackupDriftOutOfRange( inactiveRes, RESERVOIR_STEADY_CYCLE_FINAL );
 }
 
 /*********************************************************************//**
@@ -1228,9 +1239,10 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param reservoirID which is the reservoir ID that is range checked
+ * @param cycle - final or start reading for reservoir
  * @return none
  *************************************************************************/
-static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID )
+static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, RESERVOIR_STEADY_CYCLE_T cycle )
 {
     F32 loadCellPrimaryWeight, loadCellBackupWeight;
     F32 loadCellPreviousDrift, loadCellCurrentDrift;
@@ -1250,17 +1262,17 @@
 
     loadCellPrimaryWeight = getReservoirWeightLargeFilter( reservoirID );
     loadCellBackupWeight  = getReservoirBackupWeightLargeFilter( reservoirID );
-    loadCellCurrentDrift = fabs( loadCellPrimaryWeight - loadCellBackupWeight );
+    loadCellCurrentDrift  = loadCellPrimaryWeight - loadCellBackupWeight;
 
-    if ( lcLastSteadyWeight[lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) )
+    if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) ) )
     {
-        // Weight has been previously saved, ok to test
-        loadCellPreviousDrift = lcLastSteadyWeight[lcPrimaryIndex] - lcLastSteadyWeight[lcBackupIndex];
+        // Start Weight has been previously saved, ok to test
+        loadCellPreviousDrift = lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] - lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcBackupIndex];
         driftDiff = fabs ( loadCellCurrentDrift - loadCellPreviousDrift );
     }
     // Save latest reading for next test time
-    lcLastSteadyWeight[lcPrimaryIndex] = loadCellPrimaryWeight;
-    lcLastSteadyWeight[lcBackupIndex]  = loadCellBackupWeight;
+    lcLastSteadyWeight[cycle][lcPrimaryIndex] = loadCellPrimaryWeight;
+    lcLastSteadyWeight[cycle][lcBackupIndex]  = loadCellBackupWeight;
 
     // Check for drift out of range
     if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )