Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r8895655479bf7ddfe71113286ac136138b585d0a -r8481d10fb15d4ecb648ee10804b7ab31a18c720d
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 8895655479bf7ddfe71113286ac136138b585d0a)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 8481d10fb15d4ecb648ee10804b7ab31a18c720d)
@@ -826,7 +826,7 @@
  * @details \b Inputs: Pressure
  * @details \b Outputs: valve states
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE
- * when pressure is not in range during balacing chamber fill start.
+ * when pressure is not in range during balancing chamber fill start.
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillStart( void )
@@ -849,7 +849,7 @@
 
     // Check fresh and spent dialysate pressure in range or BC switch only flag set
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         //Valve control for state 1 fill
         valveControlForBCState1FillStart();
@@ -871,7 +871,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -884,7 +884,7 @@
 /*********************************************************************//**
  * @brief
  * The handleBalChamberConcentrateControl function handles the Acid and Bicarb
- * concentrate doisng and checks the conductivity of the dialysate for the treatment.
+ * concentrate dosing and checks the conductivity of the dialysate for the treatment.
  * @details \b Inputs: balChamberSWState , Concentrate volume
  * @details \b Outputs: isPressureDroppedDuringFill, state
  * @return next balancing chamber state.
@@ -950,7 +950,7 @@
     spentDialPressure               = getFilteredPressure( D51_PRES );
 
     // Check fresh dialysate pressure back in range to indicate fresh fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
         {
@@ -975,7 +975,7 @@
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeed(), TRUE );
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         // Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -987,28 +987,28 @@
 /*********************************************************************//**
  * @brief
  * The handleBalChamberState1FillEnd function check for the balancing chamber
- * switching period and tranistion to next state switching.
+ * switching period and transition to next state switching.
  * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod
  * @details \b Outputs: balChamberFillPressureDropCounter,balChamberFillCompleteStablePressureCounter
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE
- * when pressure drop is not in range during balacing chamber fill in progress.
+ * when pressure drop is not in range during balancing chamber fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE
- * when pressure is not in range during balacing chamber fill complete.
+ * when pressure is not in range during balancing chamber fill complete.
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillEnd( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_FILL_END;
 
     // On completion of cycle time, transition to next state
-    if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
+    //if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
     {
         balChamberFillPressureDropCounter = 0;
         balChamberFillCompleteStablePressureCounter = 0;
 
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {
@@ -1048,7 +1048,7 @@
  * @details \b Inputs: fresh and spent dialysate pressure
  * @details \b Outputs: valve states
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE
- * when pressure is not in range during balacing chamber state 2 fill start.
+ * when pressure is not in range during balancing chamber state 2 fill start.
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillStart( void )
@@ -1072,7 +1072,7 @@
     // Check fresh dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )  ||
         // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         // Valve control for state 2 fill
         valveControlForBCState2FillStart();
@@ -1094,7 +1094,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -1119,7 +1119,7 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
         {
@@ -1144,7 +1144,7 @@
         // close the valves
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeed(), TRUE );
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;
@@ -1170,15 +1170,15 @@
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_FILL_END;
 
     // On completion of cycle time, transition to next state
-    if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
+    //if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
     {
         balChamberFillPressureDropCounter = 0;
         balChamberFillCompleteStablePressureCounter = 0;
 
         // Pressure alarm check
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {