Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -ra711f7995e555b503ed8c295f98fbe7bb9e5abf5 -rf32ce45ed787bb8cc691bf0bf8b41d646d681e47
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a711f7995e555b503ed8c295f98fbe7bb9e5abf5)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f32ce45ed787bb8cc691bf0bf8b41d646d681e47)
@@ -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"
@@ -208,7 +209,8 @@
         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( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
+            setValveState( D54_VALV, VALVE_STATE_OPEN );    // Mapped to D80 valve, for bicarb access
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
@@ -227,6 +229,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,6 +243,7 @@
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_OPEN );    // Mapped to D80 valve, for bicarb access
             setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
@@ -253,6 +259,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
@@ -283,6 +292,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;
@@ -301,6 +313,7 @@
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
             setValveState( DD_M4_VALV, VALVE_STATE_OPEN );
+            setValveState( D54_VALV, VALVE_STATE_OPEN );    // Mapped to D80 valve, for bicarb access
             setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
             bicarbFillStartTimeMS = getMSTimerCount();
 
@@ -313,6 +326,9 @@
 
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
+
+            //Rinse pump On
+            setRinsePumpState( RINSE_PUMP_STATE_ON );
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
@@ -322,6 +338,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 );