Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -ra711f7995e555b503ed8c295f98fbe7bb9e5abf5 -r2f84c4894488f86b2a36c14184c80a1a6b1a7b48
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a711f7995e555b503ed8c295f98fbe7bb9e5abf5)
+++ 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"
@@ -85,6 +86,7 @@
 //Testing
 static U32 bypassStateDelayStartTimeMS;                                                     ///< Delay balancing chamber switching for a second to preapre pump steady state.
 static BOOL delayBypassStateFlag;                                                           ///< To indicate change in treatment parameters
+static F32 dialysateToDialyzerFlowRate;                                                     ///< Current dialysate to dialyzer flow rate (ml/min)
 
 // ********** private function prototypes **********
 
@@ -97,6 +99,7 @@
 static DD_GEND_MODE_STATE_T handleGenDIsolatedUFState( void );
 static F32 getGenDialysateTargetTemperature( void );
 static void calculateTargetDialysateTemp( void );
+static void updateDialysateToDialyzerFlowRate( void );
 static void checkDialysateTemperature( void );
 static void monitorChamberLevelStatus( void );
 static void publishGenDialysateModeData( void );
@@ -136,6 +139,7 @@
     //Testing
     bypassStateDelayStartTimeMS                 = 0;
     delayBypassStateFlag                        = TRUE;
+    dialysateToDialyzerFlowRate                 = 0.0F;
 
     //Initialize balancing chamber module
     initBalanceChamber();
@@ -206,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
@@ -227,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
@@ -238,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
 
@@ -253,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
@@ -263,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
@@ -283,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;
@@ -300,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();
 
@@ -311,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;
@@ -322,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 );
@@ -363,6 +376,9 @@
     checkDialysateTemperature();
 #endif
 
+    // Update dialysate flow rate only when in the Dialysate Delivery state
+    updateDialysateToDialyzerFlowRate();
+
     //Check temperature drift between D30 and D28
     checkDialysateTemperatureSensors();
 
@@ -436,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 )
     {
@@ -542,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;
         }
@@ -815,6 +831,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The updateDialysateToDialyzerFlowRate function updates the current dialysate
+ * to dialyzer flow rate only when in the dialysate delivery state, otherwise
+ * the flow rate is set to zero
+ * @details \b Inputs: genDialysateState
+ * @details \b Outputs: dialysateToDialyzerFlowRate
+ * @return none
+ *************************************************************************/
+void updateDialysateToDialyzerFlowRate( void )
+{
+    // Check the current Gen Dialysate Mode state
+    if ( DD_GEND_DIALYSATE_DELIVERY_STATE == genDialysateState )
+    {
+        // Update the dialysate flow rate to the TD request
+        dialysateToDialyzerFlowRate = getTDDialysateFlowrate();
+    }
+    else
+    {
+        // Set the dialysate flow rate to zero
+        dialysateToDialyzerFlowRate = 0.0F;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The getDialGoodToDeliverStatus function gets the dialysate good to deliver
  * status.
  * @details \b Inputs: isDialysateGoodtoDeliver
@@ -955,6 +995,7 @@
         data.d18Pressure                        = getFilteredPressure( D18_PRES );
         data.d51Pressure                        = getFilteredPressure( D51_PRES );
         data.isDialysateGoodtoDeliver           = (BOOL)getDialGoodToDeliverStatus();
+        data.currentQd                          = dialysateToDialyzerFlowRate;
 
         broadcastData( MSG_ID_DD_GEN_DIALYSATE_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( GEN_DIALYSATE_MODE_DATA_T ) );