Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r89c8709e3b27648926fbb20f25c9a67cbeb99adc -rf7f6305f054732569330f6001568777857e20442
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 89c8709e3b27648926fbb20f25c9a67cbeb99adc)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision f7f6305f054732569330f6001568777857e20442)
@@ -74,10 +74,10 @@
 static F32 freshDialPressure;                                                                   ///< Fresh side dialysate pressure
 static F32 spentDialPressure;                                                                   ///< Spent side dialysate pressure
 
-#ifdef __DRY_BICARB__
+//TODO: remove later
 static U32 bicarbChamberPeriodicFillCounter;                                                    ///< Counter for checking the timeout for drybicart chamber fill request.
-#endif
 
+
 // ********** private function prototypes **********
 
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillStart( void );
@@ -131,9 +131,11 @@
     isPressureDroppedDuringFill                 = FALSE;
     freshDialPressure                           = 0.0F;
     spentDialPressure                           = 0.0F;
-#ifdef __DRY_BICARB__
-    bicarbChamberPeriodicFillCounter            = 0;
-#endif
+
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbChamberPeriodicFillCounter            = 0;
+    }
 }
 
 /*********************************************************************//**
@@ -201,21 +203,22 @@
     // Increment counter indicating fill is in progress.
     currentBalChamberSwitchingCounter += 1;
 
-#ifdef __DRY_BICARB__
-    //Increment counter for dry bicarb chamber fill
-    bicarbChamberPeriodicFillCounter += 1;
-    // Fill bicarb chamber once every 60secs.
-    if ( bicarbChamberPeriodicFillCounter >= BICARB_CHAMBER_PERIODIC_FILL_TIME )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
     {
-        if ( FALSE == setBicarbChamberFillRequested() )
+        //Increment counter for dry bicarb chamber fill
+        bicarbChamberPeriodicFillCounter += 1;
+        // Fill bicarb chamber once every 60secs.
+        if ( bicarbChamberPeriodicFillCounter >= BICARB_CHAMBER_PERIODIC_FILL_TIME )
         {
-            // TODO
-            //drybicart state machines are combined and so this is not an issue in future
-            //set alarm ?
+            if ( FALSE == setBicarbChamberFillRequested() )
+            {
+                // TODO
+                //drybicart state machines are combined and so this is not an issue in future
+                //set alarm ?
+            }
+            bicarbChamberPeriodicFillCounter = 0;
         }
-        bicarbChamberPeriodicFillCounter = 0;
     }
-#endif
 
     switch ( balChamberExecState )
     {
@@ -526,10 +529,13 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isBalChamberSwitchOnly          = ( TRUE == getBalChamberSwitchingOnlyStatus() );
+    BOOL isDisableBCPressureAlarms       = ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) );
+
     // 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 ) ) &&
-         ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
+    if ( ( isFreshDialysatePressureInRange && isSpentDialysatePressureInRange ) || isBalChamberSwitchOnly  || isDisableBCPressureAlarms )
     {
         //Valve control for state 1 fill
         valveControlForBCState1FillStart();
@@ -622,15 +628,16 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_VALVES_CLOSE;
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
-        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 ) ) )
+        if ( isFreshDialysatePressureInRange && isSpentDialysatePressureInRange )
         {
             if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
             {
@@ -740,10 +747,13 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isBalChamberSwitchOnly          = ( TRUE == getBalChamberSwitchingOnlyStatus() );
+    BOOL isDisableBCPressureAlarms       = ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) );
+
     // Check fresh and spent 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_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
+    if ( ( isFreshDialysatePressureInRange && isSpentDialysatePressureInRange ) || isBalChamberSwitchOnly || isDisableBCPressureAlarms )
     {
         // Valve control for state 2 fill
         valveControlForBCState2FillStart();
@@ -785,15 +795,16 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_VALVES_CLOSE;
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
-        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 ) ) )
+        if ( isFreshDialysatePressureInRange && isSpentDialysatePressureInRange )
         {
             if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
             {