Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rf32ce45ed787bb8cc691bf0bf8b41d646d681e47 -r67b9e7ce05b6b2592a0cca8429915dcbfc36734b
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f32ce45ed787bb8cc691bf0bf8b41d646d681e47)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 67b9e7ce05b6b2592a0cca8429915dcbfc36734b)
@@ -560,11 +560,14 @@
 {
     DD_GEND_MODE_STATE_T state              = DD_GEND_DIALYSATE_BYPASS_STATE;
     BOOL balancingChambFillInProgress       = getBalancingChamberFillinProgressStatus();
+    F32 freshDialPressure                   = getFilteredPressure( D18_PRES );
+    F32 spentDialPressure                   = getFilteredPressure( D51_PRES );
 
-    //Testing
+    //Testing : Wait for the fresh and spent pressure in range or timeout
     if ( TRUE == delayBypassStateFlag )
     {
-        if (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BC_SWITCHING_AT_START_UP ) )
+        if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) ) ||
+             (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BC_SWITCHING_AT_START_UP ) ) )
         {
             delayBypassStateFlag = FALSE;
         }