Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r88ca2dc610e3a7a5bbf2239e01ae1c6ea6686bfc -r3aac7749a31eb254dd0edd482033ece1da17dc40
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 88ca2dc610e3a7a5bbf2239e01ae1c6ea6686bfc)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3aac7749a31eb254dd0edd482033ece1da17dc40)
@@ -993,43 +993,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_DD_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 != isPressureStabilizedDuringFill )
-                {
-                    // 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 != isPressureStabilizedDuringFill )
+            {
+                // 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;
 }
@@ -1155,52 +1151,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_DD_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 != isPressureStabilizedDuringFill )
-                {
-                    // 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 != isPressureStabilizedDuringFill )
+            {
+                // 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;
 }