Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r1eb57936e55314b89912f06cd634a17e4a4ed999 -r8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 1eb57936e55314b89912f06cd634a17e4a4ed999)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc)
@@ -73,6 +73,9 @@
 static F32 lastTdDialysateFlowrate;                                                             ///< Previous TD dialysate flow rate
 static F32 freshDialPressure;                                                                   ///< Fresh side dialysate pressure
 static F32 spentDialPressure;                                                                   ///< Spent side dialysate pressure
+static BOOL isBalChamberSwitchingActive;                                                        ///< Flag indicating balancing chamber switching is active or not.
+static BOOL isBalChamberSwitchingOnRequested;                                                   ///< Flag indicating that a request was made to activate balancing chamber switching.
+static BOOL isBalChamberSwitchingOffRequested;                                                  ///< Flag indicating that a request was made to deactivate balancing chamber switching.
 
 //TODO: remove later once level sensor working
 static U32 bicarbChamberPeriodicFillCounter;                                                    ///< Counter for checking the timeout for drybicart chamber fill request.
@@ -86,6 +89,7 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillStart( void );
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void );
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillEnd(void);
+static BAL_CHAMBER_EXEC_STATE_T handleBalChamberStateIdle( void );
 static void publishBalChamberData( void );
 static U32 getBalChamberDataPublishInterval( void );
 
@@ -98,7 +102,7 @@
  *************************************************************************/
 void initBalanceChamber( void )
 {
-    balChamberExecState                         = BAL_CHAMBER_STATE_START;
+    balChamberExecState                         = BAL_CHAMBER_STATE_IDLE;
     balChamberSWState                           = BAL_CHAMBER_SW_STATE1;
     balChamberSwitchingFreq.data                = 0.0F;
     balChamberSwitchingFreq.ovData              = 0.0F;
@@ -130,6 +134,9 @@
     isPressureDroppedDuringFill                 = FALSE;
     freshDialPressure                           = 0.0F;
     spentDialPressure                           = 0.0F;
+    isBalChamberSwitchingActive                 = FALSE;
+    isBalChamberSwitchingOnRequested            = FALSE;
+    isBalChamberSwitchingOffRequested           = FALSE;
 
     //TODO:remove once level sensor working
     bicarbChamberPeriodicFillCounter            = 0;
@@ -219,8 +226,8 @@
 
     switch ( balChamberExecState )
     {
-        case BAL_CHAMBER_STATE_START:
-            balChamberExecState = BAL_CHAMBER_STATE1_FILL_START;
+        case BAL_CHAMBER_STATE_IDLE:
+            balChamberExecState = handleBalChamberStateIdle();
             break;
 
         case BAL_CHAMBER_STATE1_FILL_START:
@@ -257,7 +264,7 @@
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_BAL_CHAMBER_INVALID_EXEC_STATE, balChamberExecState )
-            balChamberExecState = BAL_CHAMBER_STATE_START;
+            balChamberExecState = BAL_CHAMBER_STATE_IDLE;
             break;
     }
 
@@ -269,6 +276,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The requestBalChamberSwitching function activates or deactivates balancing chamber switching.
+ * @details \b Inputs: none
+ * @details \b Outputs: isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested
+ * @param activate - TRUE to activate and FALSE to deactivate.
+ * @return none.
+ *************************************************************************/
+void requestBalChamberSwitching( BOOL activate )
+{
+    if ( TRUE == activate )
+    {
+        isBalChamberSwitchingOnRequested = TRUE;
+    }
+    else
+    {
+        isBalChamberSwitchingOffRequested = TRUE;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The valveControlForBCClosedState function closes the all balancing
  * chamber valves.
  * @details \b Inputs: none
@@ -722,6 +749,22 @@
         }
     }
 
+    // Keep Clearing the On request flag in case an On request was made while the switching is active
+    isBalChamberSwitchingOnRequested =  FALSE;
+
+    // Check if a request made was to deactivate the balancing chamber switching.
+    if ( TRUE == isBalChamberSwitchingOffRequested )
+    {
+        //Clear the request flag to indicate that the request was processed.
+        isBalChamberSwitchingOffRequested = FALSE;
+
+        // Clear the flag to indicate that balancing chamber switching is inactive
+        isBalChamberSwitchingActive = FALSE;
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
+    }
+
     return state;
 }
 
@@ -901,11 +944,57 @@
         }
     }
 
+    // Keep Clearing the On request flag in case an On request was made while the switching is active
+    isBalChamberSwitchingOnRequested =  FALSE;
+
+    // Check if a request made was to deactivate the balancing chamber switching.
+    if ( TRUE == isBalChamberSwitchingOffRequested )
+    {
+        // Clear the request flag to indicate that the request was processed.
+        isBalChamberSwitchingOffRequested = FALSE;
+
+        // Clear flag to indicate that balancing chamber switching is inactive
+        isBalChamberSwitchingActive = FALSE;
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
+    }
+
     return state;
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleBalChamberStateIdle function handles balancing chamber idle state.
+ * @details \b Inputs: isBalChamberSwitchingOnRequested
+ * @details \b Outputs: isBalChamberSwitchingActive
+ * @return next balancing chamber state.
+ *************************************************************************/
+static BAL_CHAMBER_EXEC_STATE_T handleBalChamberStateIdle( void )
+{
+    BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE_IDLE;
+
+    // Keep Clearing the off request flag in case an off request was made while we were already in the idle state
+    isBalChamberSwitchingOffRequested =  FALSE;
+
+    // Check if a request made was to activate the balancing chamber switching.
+    if ( TRUE == isBalChamberSwitchingOnRequested )
+    {
+        //Clear the request flag to indicate that the request was processed.
+        isBalChamberSwitchingOnRequested = FALSE;
+
+        // Set flag to indicate that balancing chamber switching is active
+        isBalChamberSwitchingActive = TRUE;
+
+        // Move to the start state1
+        state = BAL_CHAMBER_STATE1_FILL_START;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getBalChamberDataPublishInterval function gets the balancing chamber
  * data publish interval.
  * @details \b Inputs: balChamberDataPublishInterval
@@ -948,6 +1037,7 @@
         data.currentBalChamberSwitchingCounter  = currentBalChamberSwitchingCounter;
         data.isPressureStabilizedDuringFill     = isPressureStabilizedDuringFill;
         data.balChamberSWOnlyState              = balanceChamberSwitchingOnly;
+        data.isBalChamberSwitchingActive        = isBalChamberSwitchingActive;
 
         broadcastData( MSG_ID_DD_BAL_CHAMBER_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( BAL_CHAMBER_DATA_T ) );
 
@@ -1035,7 +1125,6 @@
  * chamber switching only without dosing delivery  and pressure check condition.
  * @details \b Inputs: tester logged in
  * @details \b Outputs: tdDialysateFlowrate,balanceChamberSwitchingOnly
- * pendingBalanceChamberSwOnlyRequest
  * @param message set message from Dialin which includes the balancing chamber
  * to start/stop switching and update switching rate based on the flow rate.
  * @return TRUE if set request is successful, FALSE if not