Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rc137d3c7cb17b0364d745e10ff6dbd1901eb1baa -r40e8c3a97babf6910cc6e9602d691f8e56691c17
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision c137d3c7cb17b0364d745e10ff6dbd1901eb1baa)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 40e8c3a97babf6910cc6e9602d691f8e56691c17)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModePostTreat.c
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      24-Aug-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -229,8 +229,13 @@
     treatmentLogData.dialysateVolumeUsed_L = treatmentLogData.avgDialysateFlow_mL_min * treatmentLogData.actualTreatmentDur_sec / ( ML_PER_LITER * SEC_PER_MIN );
     treatmentLogData.avgDialysateTemperature_degC = getTreatmentAvgDialysateTemp();
 
+    // original UF Volume/Rate
+    treatmentLogData.originUFVolume_L = getUltrafiltrationVolumeOriginal();
+    treatmentLogData.originUFRate_mL_min = getUltrafiltrationRateOriginal();
+    // Target UF Volume/Rate
     treatmentLogData.targetUFVolume_L = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
-    treatmentLogData.targetUFRate_mL_min = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER * SEC_PER_MIN / treatmentLogData.treatmentDuration_sec;
+    treatmentLogData.targetUFRate_mL_min = ( ( treatmentLogData.targetUFVolume_L * ML_PER_LITER * SEC_PER_MIN ) / treatmentLogData.treatmentDuration_sec );
+    // Actual UF Volume/Rate
     if ( treatmentLogData.actualTreatmentDur_sec > 0 )
     {
         treatmentLogData.actualUFVolume_L = getUltrafiltrationVolumeCollected() / ML_PER_LITER;
@@ -248,6 +253,7 @@
     treatmentLogData.heparinDispenseRate_mL_hr = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
     treatmentLogData.heparinPreStop_min = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
     treatmentLogData.heparinDeliveredVolume_mL = getSyringePumpVolumeDelivered();
+    treatmentLogData.heparinType = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_TYPE );
 
     treatmentLogData.avgArterialPressure_mmHg = getTreatmentAvgArterialPressure();
     treatmentLogData.avgVenousPressure_mmHg = getTreatmentAvgVenousPressure();
@@ -354,15 +360,17 @@
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void )
 {
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
     VALVE_T valve;
 
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if (( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) && (STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH )))
     {
-#ifdef SKIP_UI_INTERACTION
-        patientDisconnectionConfirmed = TRUE;
-#endif
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+        {
+            patientDisconnectionConfirmed = TRUE;
+        }
+
         if ( TRUE == patientDisconnectionConfirmed )
         {
             patientDisconnectionConfirmed = FALSE;
@@ -403,9 +411,10 @@
 {
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
-#ifdef SKIP_UI_INTERACTION
-    disposableRemovalConfirmed = TRUE;
-#endif
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+    {
+        disposableRemovalConfirmed = TRUE;
+    }
 
     if ( TRUE == disposableRemovalConfirmed )
     {
@@ -419,40 +428,38 @@
 /*********************************************************************//**
  * @brief
  * The handlePostTreatmentVerifyState function verifies cartridge removed,
- * syringe removed, and doors are closed before transition to standby mode.
+ * syringe removed before transition to standby mode.
  * @details Inputs: doors' status, syringe status, occlusion sensors value
  * @details Outputs: requested transition to standby mode
  * @return current state (sub-mode)
  *************************************************************************/
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentVerifyState( void )
 {
-#ifndef SKIP_CARTRIDGE_REMOVAL
-    BOOL isCartridgeRemoved = isCartridgeUnloaded();
-#else
+    // Assuming the cartridge door is removed already.
+    // This is used when the disable cartridge removal step software configuration is enabled
     BOOL isCartridgeRemoved = TRUE;
+
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CARTRIDGE_REMOVAL_STEP ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+    {
+        isCartridgeRemoved = isCartridgeUnloaded();
+    }
 
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( FALSE == isCartridgeRemoved )
     {
-        if ( FALSE == isCartridgeRemoved )
-        {
-            activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
-        }
+        activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
+    }
 
-        if ( TRUE == isSyringeDetected() )
-        {
-            activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
-        }
-        // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
-        if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
-        {
-            cmdStopDG();
-            requestNewOperationMode( MODE_STAN );
-        }
+    if ( TRUE == isSyringeDetected() )
+    {
+        activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
     }
-    else
+    // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
+    if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
     {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        cmdStopDG();
+        requestNewOperationMode( MODE_STAN );
     }
 
     return HD_POST_TREATMENT_VERIFY_STATE;
@@ -567,7 +574,7 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
@@ -626,7 +633,7 @@
     }
 
     // Drain has started and DG goes to generation idle mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }