Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -refed432eddd3b47deb44b68088e534ac539b47f6 -r2582d728ac1be6d159fa0ef37b1d443f09d7a168
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision efed432eddd3b47deb44b68088e534ac539b47f6)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2582d728ac1be6d159fa0ef37b1d443f09d7a168)
@@ -825,7 +825,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();
@@ -847,7 +847,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 );
@@ -969,43 +969,39 @@
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_FILL_END;
 
-    // On completion of cycle time, transition to next state
-    //if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
-    {
-        balChamberFillPressureDropCounter = 0;
-        balChamberFillCompleteStablePressureCounter = 0;
+    balChamberFillPressureDropCounter = 0;
+    balChamberFillCompleteStablePressureCounter = 0;
 
-        if ( TRUE != getBalChamberSwitchingOnlyStatus() )
+    if ( TRUE != getBalChamberSwitchingOnlyStatus() )
+    {
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
             {
-                if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
-                {
-                    // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
-                }
-                else if ( TRUE != isPressureStalbilizedDuringFill )
-                {
-                    // Alarm when switching time expired, but still pressure not in range which indicates fill is not yet completed.
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
-                }
-                else
-                {
-                    // Move to next state when pressure is in range.
-                    state = BAL_CHAMBER_STATE2_FILL_START;
-                }
+                // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
             }
+            else if ( TRUE != isPressureStalbilizedDuringFill )
+            {
+                // Alarm when switching time expired, but still pressure not in range which indicates fill is not yet completed.
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+            }
             else
             {
-                // Allow to proceed next state even though pressure is not stabilized.
+                // Move to next state when pressure is in range.
                 state = BAL_CHAMBER_STATE2_FILL_START;
             }
         }
         else
         {
+            // Allow to proceed next state even though pressure is not stabilized.
             state = BAL_CHAMBER_STATE2_FILL_START;
         }
     }
+    else
+    {
+        state = BAL_CHAMBER_STATE2_FILL_START;
+    }
 
     return state;
 }
@@ -1041,7 +1037,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();
@@ -1063,7 +1059,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 );
@@ -1131,52 +1127,48 @@
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_FILL_END;
 
-    // On completion of cycle time, transition to next state
-    //if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
-    {
-        balChamberFillPressureDropCounter = 0;
-        balChamberFillCompleteStablePressureCounter = 0;
+    balChamberFillPressureDropCounter = 0;
+    balChamberFillCompleteStablePressureCounter = 0;
 
-        // Pressure alarm check
-        if ( TRUE != getBalChamberSwitchingOnlyStatus() )
+    // Pressure alarm check
+    if ( TRUE != getBalChamberSwitchingOnlyStatus() )
+    {
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
             {
-                if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
-                {
-                    // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
-                }
-                else if ( TRUE != isPressureStalbilizedDuringFill )
-                {
-                    // Alarm when switching time expired, but still pressure not in range which indicates fill is not completed.
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
-                }
-                else
-                {
-                    // Move to next state when pressure is in range.
-                    state = BAL_CHAMBER_STATE1_FILL_START;
-                }
+                // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
             }
+            else if ( TRUE != isPressureStalbilizedDuringFill )
+            {
+                // Alarm when switching time expired, but still pressure not in range which indicates fill is not completed.
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+            }
             else
             {
-                // Allow to proceed next state even though pressure is not stabilized.
+                // Move to next state when pressure is in range.
                 state = BAL_CHAMBER_STATE1_FILL_START;
-
             }
         }
         else
         {
+            // Allow to proceed next state even though pressure is not stabilized.
             state = BAL_CHAMBER_STATE1_FILL_START;
-        }
 
-        // Trigger pressure drop alarm after first cycle of balancing chamber switching complete
-        if ( FALSE == isFirstCycleBCSwitchingCompleted )
-        {
-            isFirstCycleBCSwitchingCompleted = TRUE;
         }
     }
+    else
+    {
+        state = BAL_CHAMBER_STATE1_FILL_START;
+    }
 
+    // Trigger pressure drop alarm after first cycle of balancing chamber switching complete
+    if ( FALSE == isFirstCycleBCSwitchingCompleted )
+    {
+        isFirstCycleBCSwitchingCompleted = TRUE;
+    }
+
     return state;
 }