Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r90d3a2eb18cc8282c0c68a23e39677327448781a -r52a40b3e01e67899cdeabdf64f4efddbe4654007
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 52a40b3e01e67899cdeabdf64f4efddbe4654007)
@@ -7,8 +7,8 @@
 *
 * @file    ModePostTreat.c
 *
-* @author  (last)      Behrouz NematiPour
-* @date    (last)      04-Jan-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      15-Feb-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -184,9 +184,11 @@
 
     if ( ++postTreatmentPublishTimerCounter >= getU32OverrideValue( &postTreatmentModePublishInterval ) )
     {
-        U32 state = (U32)currentPostTreatmentState;
+        POST_TREATMENT_STATE_DATA_T data;
 
-        broadcastData( MSG_ID_HD_POST_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&state, sizeof( U32 ) );
+        data.currentPostTreatmentState = (U32)currentPostTreatmentState;
+
+        broadcastData( MSG_ID_HD_POST_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POST_TREATMENT_STATE_DATA_T ) );
         postTreatmentPublishTimerCounter = 0;
     }
 
@@ -366,12 +368,13 @@
 
     if ( STATE_CLOSED == getFPGADoorState() )
     {
-#ifdef SKIP_UI_INTERACTION
-        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+#endif
         {
             patientDisconnectionConfirmed = TRUE;
         }
-#endif
+
         if ( TRUE == patientDisconnectionConfirmed )
         {
             patientDisconnectionConfirmed = FALSE;
@@ -412,8 +415,8 @@
 {
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
-#ifdef SKIP_UI_INTERACTION
-    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         disposableRemovalConfirmed = TRUE;
     }
@@ -438,11 +441,16 @@
  *************************************************************************/
 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() )
     {
@@ -579,7 +587,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;
     }
@@ -638,7 +646,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;
     }