Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r5356f3f1bf66fa22aeb9e17b899a2be667865360 -r2f84c4894488f86b2a36c14184c80a1a6b1a7b48
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5356f3f1bf66fa22aeb9e17b899a2be667865360)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 2f84c4894488f86b2a36c14184c80a1a6b1a7b48)
@@ -28,6 +28,7 @@
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "Pressure.h"
+#include "RinsePump.h"
 #include "SpentChamberFill.h"
 #include "TaskGeneral.h"
 #include "TDInterface.h"
@@ -209,7 +210,6 @@
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
@@ -230,6 +230,9 @@
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
 
+            //Rinse pump On
+            setRinsePumpState( RINSE_PUMP_STATE_ON );
+
             transitionToBalChamberFill();
 
             //Testing
@@ -241,7 +244,6 @@
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D64_VALV, VALVE_STATE_CLOSED );
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
 
@@ -256,6 +258,9 @@
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
 
+            //Rinse pump On
+            setRinsePumpState( RINSE_PUMP_STATE_ON );
+
             // Disable bypass valve
             setValveState( D34_VALV, VALVE_STATE_CLOSED );  // Bypass valve
             setValveState( D35_VALV, VALVE_STATE_OPEN );    // VDI
@@ -266,8 +271,6 @@
             //Set valves and actuators
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
-
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
@@ -286,6 +289,9 @@
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
 
+            //Rinse pump On
+            setRinsePumpState( RINSE_PUMP_STATE_ON );
+
             //Transition to spent chamber fill
             transitionToSpentChamberFill();
             break;
@@ -303,7 +309,6 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
             bicarbFillStartTimeMS = getMSTimerCount();
 
@@ -314,6 +319,9 @@
             setD28TempFeedbackControl( FALSE );
             startHeater( D5_HEAT );
 
+            //Rinse pump On
+            setRinsePumpState( RINSE_PUMP_STATE_ON );
+
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
             break;
@@ -325,6 +333,8 @@
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
             requestConcentratePumpOff( D76_PUMP, FALSE );
+            //Rinse pump Off
+            setRinsePumpState( RINSE_PUMP_STATE_OFF );
 
             stopHeater( D5_HEAT );
             stopHeater( D45_HEAT );
@@ -442,9 +452,6 @@
     BOOL result                 = FALSE;
     LEVEL_STATE_T floaterLevel  = getLevelStatus( D6_LEVL );
 
-    //Make sure Water Inlet Valve is open
-    setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
-
     // High level is met
     if ( LEVEL_STATE_HIGH == floaterLevel )
     {
@@ -548,11 +555,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;
         }