Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r9e0db1f82f13693d251e00e8958c8063dd89cae6 -r095866efd8f10bdead490578e7584051d79292f0
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 9e0db1f82f13693d251e00e8958c8063dd89cae6)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 095866efd8f10bdead490578e7584051d79292f0)
@@ -61,11 +61,11 @@
 #define ZERO_DIAL_FLOW_RATE                             0.0F                                        ///< Zero dialysate flow rate
 #define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
 #define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
+
 #define PUMP_SPEED_SLOPE_FACTOR_DIENER_2000             1.24F                                       ///< D48 Diener 2000 pump speed slope (y = 1.24x + 30).
 #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000         30.0F                                       ///< D48 Diener 2000 pump speed intercept.
 #define PUMP_SPEED_SLOPE_FACTOR_DIENER_1000             2.869F                                      ///< D48 Diener 1000 pump speed slope (y = 2.869x + 25.956).
 #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000         25.956F                                     ///< D48 Diener 1000 pump speed intercept.
-
 #define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
 
 //Testing
@@ -270,7 +270,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
             {
                 setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
             }
@@ -319,7 +319,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
             {
                 setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
             }
@@ -704,28 +704,14 @@
 {
     U32 rpm;
     U32 nominalRpm;
-    F32 dialFlowRate = getBalChamberActiveDialysateFlowrate();
 
     nominalRpm = getD48PumpSpeed();
     rpm        = nominalRpm;
 
-//    if ( nominalRpm <= BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM )
-//    {
-//        rpm = BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM;
-//    }
-
-    if ( ( dialFlowRate >= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_1 ) && ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_2 ) )
+    if ( nominalRpm <= BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM )
     {
-        rpm = BAL_CHAMBER_TIME_BASED_BAND_1;
+        rpm = BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM;
     }
-    else if ( ( dialFlowRate > BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_2 ) && ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_3 ) )
-    {
-        rpm = BAL_CHAMBER_TIME_BASED_BAND_2;
-    }
-    else if ( ( dialFlowRate > BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_3 ) && ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_4 ) )
-    {
-        rpm = BAL_CHAMBER_TIME_BASED_BAND_3;
-    }
 
     return rpm;
 }