Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r3c471c54d27025f8f53e1a46a7d67faab1fac108 -rb306a0de592542e6805afde6ddb8e886f3b91c63
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 3c471c54d27025f8f53e1a46a7d67faab1fac108)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision b306a0de592542e6805afde6ddb8e886f3b91c63)
@@ -37,7 +37,7 @@
 
 // ********** private definitions **********
 
-#define TARGET_RINSEBACK_VOLUME_ML                  300.0                   ///< Target rinseback volume to deliver back to the patient (in mL).  TODO - get from Systems when available
+#define TUBING_RINSEBACK_VOLUME_ML                   80.0                   ///< Target rinseback volume to deliver back to the patient (in mL).
 #define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0                   ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
 #define MAX_RINSEBACK_VOLUME_ERROR_ML                60.0                   ///< Maximum error in total additional rinseback volume (20% of total).
 #define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        10.0                   ///< Target rinseback volume for an additional volume request (in mL).
@@ -64,6 +64,7 @@
 static U32  rinsebackRate_mL_min;                                           ///< Rinseback rate to use/adjust for this current rinseback only.
 static U32  rinsebackTimerCtr;                                              ///< Timer counter for time spent in rinseback sub-mode.
 
+static F32  rinsebackTargetVolume_mL = 300.0;                               ///< Calculated target rinseback volume (based on selected dialyzer and fixed tubing volume).
 static OVERRIDE_F32_T  cumulativeRinsebackVolume_mL = { 0.0, 0.0, 0.0, 0 }; ///< Total cumulative rinseback volume (in mL) from measured blood flow rate.
 static F32  expectedRinsebackVolume_mL = 0.0;                               ///< Total cumulative rinseback volume (in mL) expected based on target blood flow rate.
 static F32  targetRinsebackVolumePlusAdditional_mL;                         ///< Target rinseback volume w/ additional volume(s) added (in mL).
@@ -125,7 +126,8 @@
 {
     rinsebackState = RINSEBACK_STOP_INIT_STATE;
     rinsebackRate_mL_min = getTreatmentParameterU32( TREATMENT_PARAM_RINSEBACK_FLOW_RATE );
-    targetRinsebackVolumePlusAdditional_mL = TARGET_RINSEBACK_VOLUME_ML;
+    rinsebackTargetVolume_mL = TUBING_RINSEBACK_VOLUME_ML + (F32)getDialyzerBloodVolume();
+    targetRinsebackVolumePlusAdditional_mL = rinsebackTargetVolume_mL;
     rinsebackTimerCtr = 0;
     cumulativeRinsebackVolume_mL.data = 0.0;
     expectedRinsebackVolume_mL = 0.0;
@@ -378,7 +380,7 @@
         result = RINSEBACK_STOP_STATE;
     }
     // Has rinseback completed?
-    else if ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML )
+    else if ( getRinsebackVolume() >= rinsebackTargetVolume_mL )
     {
         setRinsebackIsCompleted( TRUE );
         setupForRinsebackStopOrPause();
@@ -398,16 +400,15 @@
         setupForRinsebackStopOrPause();
         result = RINSEBACK_PAUSED_STATE;
     }
-#ifndef DISABLE_PUMP_FLOW_CHECKS
     // Is rinseback taking too long?
-    else if ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML )
+    else if ( ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) &&
+              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
         setRinsebackIsCompleted( TRUE );
         setupForRinsebackStopOrPause();
         activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE );
         result = RINSEBACK_STOP_STATE;
     }
-#endif
     // Otherwise, continue rinseback
     else
     {   // Has user requested rate change?
@@ -482,20 +483,20 @@
     RINSEBACK_STATE_T result = RINSEBACK_STOP_STATE;
 
     // Have we been in this stopped state for too long w/o having delivered full blood volume back to patient?
-    if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < TARGET_RINSEBACK_VOLUME_ML ) )
+    if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
         activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) && ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML ) )
+    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
         activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
         clearAlarm( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) && ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML ) )
+    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
         activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
@@ -507,7 +508,7 @@
     {
         additionalRinsebackRequested = FALSE;
         // deliver additional rinseback volume only if max volume not reached and max time not reached
-        if ( ( rinsebackTimerCtr < MAX_RINSEBACK_TIME ) || ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML ) )
+        if ( ( rinsebackTimerCtr < MAX_RINSEBACK_TIME ) || ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
         {
             rinsebackAdditionalTimerCtr = 0;
             additionalRinsebackVolume_mL = 0.0;
@@ -580,7 +581,7 @@
     {
         setupForRinsebackStopOrPause();
         // If this additional rinseback volume has brought us to "full" rinseback volume, set flag
-        if ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML )
+        if ( getRinsebackVolume() >= rinsebackTargetVolume_mL )
         {
             setRinsebackIsCompleted( TRUE );
         }
@@ -896,7 +897,7 @@
     {
         *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE;
     }
-    else if ( getRinsebackVolume() < TARGET_RINSEBACK_VOLUME_ML )
+    else if ( getRinsebackVolume() < rinsebackTargetVolume_mL )
     {
         *rejReason = REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED;
     }
@@ -982,7 +983,7 @@
     {
         RINSEBACK_DATA_PAYLOAD_T data;
         U32 timeout = MAX_RINSEBACK_TIME  / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
-        U32 countdown = ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML ? MAX_RINSEBACK_DONE_TIME : MAX_RINSEBACK_TIME );
+        U32 countdown = ( getRinsebackVolume() >= rinsebackTargetVolume_mL ? MAX_RINSEBACK_DONE_TIME : MAX_RINSEBACK_TIME );
 
         countdown -= rinsebackTimerCtr;
         // Handle countdown past zero
@@ -996,7 +997,7 @@
         data.targetRinsebackVolumeMl = rinsebackTargetVolume_mL;
         rinsebackPublishTimerCtr = 0;
         // If we have completed rinseback, timeout is no longer in force - indicate by zeroing timeout.  Also include any additionals to target.
-        if ( ( rinsebackState > RINSEBACK_PAUSED_STATE ) && ( getRinsebackVolume() >= TARGET_RINSEBACK_VOLUME_ML ) )
+        if ( ( rinsebackState > RINSEBACK_PAUSED_STATE ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
         {
             data.targetRinsebackVolumeMl = targetRinsebackVolumePlusAdditional_mL;
             timeout = MAX_RINSEBACK_DONE_TIME  / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );