Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -re81c8386abc9ae2d00c27bfd3975543fe26141b4 -r0c0260299f210c9d80e684b1e0605b799880007b
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision e81c8386abc9ae2d00c27bfd3975543fe26141b4)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 0c0260299f210c9d80e684b1e0605b799880007b)
@@ -174,6 +174,8 @@
 
     initGenDialysateMode();
     setCurrentSubState( NO_SUB_STATE );
+    // Deactivate Balancing Chamber Switching
+    requestBalChamberSwitching( FALSE );
     //calculateD48PumpSpeedForBCFill();
     initialD48PumpSpeed = getCalculatedD48PumpSpeedForBCFill();
     setD48PumpSpeedForBCFill( initialD48PumpSpeed );
@@ -242,6 +244,9 @@
     switch( state )
     {
         case DD_GEND_STATE_START:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             // Do nothing
             break;
 
@@ -271,7 +276,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -284,13 +296,18 @@
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
             transitionToBalChamberFill();
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
 
             //Testing
             bypassStateDelayStartTimeMS = getMSTimerCount();
             delayBypassStateFlag        = TRUE;
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
+
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D8_VALV, VALVE_STATE_CLOSED );
@@ -308,7 +325,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
@@ -332,6 +356,9 @@
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             //Set valves and actuators
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
@@ -361,8 +388,6 @@
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
-            // Stop trimmer heater
-            stopHeater( D45_HEAT );
 
             setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
@@ -375,6 +400,9 @@
             break;
 
         case DD_GEND_BICARB_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -411,6 +439,8 @@
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
@@ -452,6 +482,8 @@
             break;
 
         case DD_GEND_ISOLATED_UF_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             //TODO : define actuators states
             break;
 
@@ -740,11 +772,6 @@
             delayBypassStateFlag = FALSE;
         }
     }
-    else
-    {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-    }
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
@@ -821,9 +848,6 @@
 #endif
     else
     {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-
         //Execute ultrafiltration
         execUFControl();
     }