Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -ree311636fcfb7db1913edef2d9fea22153465a87 -rb4e65bc0026ff22f0bb77e4e066724368ef1cfd5
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision ee311636fcfb7db1913edef2d9fea22153465a87)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b4e65bc0026ff22f0bb77e4e066724368ef1cfd5)
@@ -110,7 +110,7 @@
 //TODO: remove later once level sensor working
 static U32 bicarbChamberPeriodicFillCounter;  
 // Balancing chamber state change tracker
-static BAL_CHAMBER_EXEC_STATE_T prevState;                                                      ///< Balancing chamber Previous State tracking variable
+static BAL_CHAMBER_EXEC_STATE_T prevBalChamberState;                                            ///< Balancing chamber Previous State tracking variable
 
 // ********** private function prototypes **********
 
@@ -187,7 +187,7 @@
     pendingTdDialysateFlowrate                  = 0.0F;
     isBalChamberSwitchingPeriodUpdatePending    = FALSE;
     bcSwitchingBasedOnClosedPeriodCounter       = 0;
-    prevState                                   = BAL_CHAMBER_STATE_IDLE;
+    prevBalChamberState                         = BAL_CHAMBER_STATE_IDLE;
     //TODO:remove once level sensor working
     bicarbChamberPeriodicFillCounter            = 0;
 }
@@ -418,26 +418,16 @@
             break;
     }
 
-    if ( prevState != balChamberExecState )
+    if ( prevBalChamberState != balChamberExecState )
     {
-        if ( BAL_CHAMBER_STATE_IDLE == balChamberExecState )
+        if ( ( BAL_CHAMBER_STATE_IDLE == balChamberExecState ) ||
+             ( BAL_CHAMBER_STATE1_FILL_START == balChamberExecState ) ||
+             ( BAL_CHAMBER_STATE2_FILL_START == balChamberExecState ) )
         {
-            SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_STATE_CHANGE, prevState, balChamberExecState );
+            SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_STATE_CHANGE, prevBalChamberState, balChamberExecState );
         }
-        else if ( BAL_CHAMBER_STATE1_FILL_END == prevState && BAL_CHAMBER_STATE2_FILL_START == balChamberExecState )
-        {
-            SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_STATE_CHANGE, prevState, balChamberExecState );
-        }
-        else if ( BAL_CHAMBER_STATE2_FILL_END == prevState && BAL_CHAMBER_STATE1_FILL_START == balChamberExecState )
-        {
-            SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_STATE_CHANGE, prevState, balChamberExecState );
-        }
-        else if ( BAL_CHAMBER_STATE_IDLE == prevState && BAL_CHAMBER_STATE1_FILL_START == balChamberExecState )
-        {
-            SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_STATE_CHANGE, prevState, balChamberExecState );
-        }
     }
-    prevState = balChamberExecState;
+    prevBalChamberState = balChamberExecState;
 
     //Publish balancing chamber data
     publishBalChamberData();
@@ -1497,8 +1487,8 @@
  *************************************************************************/
 void setBalChamberSwitchingOnlyStatus( BOOL OnOff )
 {
-    SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE, balanceChamberSwitchingOnly,isBalChamberSwitchingActive );
     balanceChamberSwitchingOnly = OnOff;
+    SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE, balanceChamberSwitchingOnly,isBalChamberSwitchingActive );
 }
 
 /*********************************************************************//**