Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -r1b110e3b2462fda74aa8f2811aad9ce61cb80309
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 1b110e3b2462fda74aa8f2811aad9ce61cb80309)
@@ -549,11 +549,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;
         }