Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r2300599935a7171e3050a15d3b4690aa7d0bb7ef -rb4f599b29259cc0d545e5513dd5f27dbae58332b
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2300599935a7171e3050a15d3b4690aa7d0bb7ef)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b4f599b29259cc0d545e5513dd5f27dbae58332b)
@@ -75,7 +75,9 @@
 static U32 balChamberDataPublicationTimerCounter;                                               ///< Used to schedule balancing chamber data publication to CAN bus.
 static U32 balChamberFillPressureDropCounter;                                                   ///< Counter to check balancing chamber valves opened and there by pressure drop is seen.
 static OVERRIDE_U32_T balChamberDataPublishInterval;                                            ///< Balancing chamber data publish interval.
-static BOOL balanceChamberSwitchingOnly;                                                        ///< Balancing chamber switching without any pressure check and dosing delivery.
+static BOOL balanceChamberSwitchingOnly;                                                        ///< Balancing chamber switching without any pressure check and dosing delivery
+static BOOL balanceChamberSwitchingOnlyOnRequested;                                             ///< Flag indicating that a request was made to activate balancing chamber switching only
+static BOOL balanceChamberSwitchingOnlyOffRequested;                                            ///< Flag indicating that a request was made to deactivate balancing chamber switching only
 static BOOL isPressureDroppedDuringFill;                                                        ///< Flag indicating that the pressure is dropped due to BC fill (state 1 or state 2) in progress condition.
 static BOOL isFirstCycleBCSwitchingCompleted;                                                   ///< Flag indicating that first time balancing chamber swithcing is done to trigger alarms from next cycle onwards.
 static U32 balChamberFillCompleteStablePressureCounter;                                         ///< Counter to check balancing chamber fill complete and stable pressure is met.
@@ -137,6 +139,8 @@
     bicarbDoseVolume.ovInitData                 = 0.0F;
     bicarbDoseVolume.override                   = OVERRIDE_RESET;
     balanceChamberSwitchingOnly                 = FALSE;
+    balanceChamberSwitchingOnlyOnRequested      = FALSE;
+    balanceChamberSwitchingOnlyOffRequested     = FALSE;
     balChamberSwitchingPeriod                   = 0;
     balChamberValveClosePeriod                  = 0;
     isBalChamberFillInProgress                  = FALSE;
@@ -602,6 +606,9 @@
     if ( ( balChamberFillTimeoutCount > 0 ) && ( currentBalChamberFillCounter > balChamberFillTimeoutCount ) )
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_BC_FILL_TIMEOUT_FAULT, currentBalChamberFillCounter, balChamberFillTimeoutCount );
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
     }
 
     // Check fresh dialysate pressure back in range to indicate fresh fill complete.
@@ -646,9 +653,10 @@
  * The handleBalChamberState1FillEnd function check for the balancing chamber
  * switching period and transition to next state switching.
  * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod,
- * isBalChamberSwitchingOffRequested
+ * isBalChamberSwitchingOffRequested, balanceChamberSwitchingOnlyOffRequested
  * @details \b Outputs: balChamberFillPressureDropCounter,balChamberFillCompleteStablePressureCounter
- * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive
+ * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive,
+ * balanceChamberSwitchingOnlyOffRequested
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE
  * when pressure drop is not in range during balancing chamber fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE
@@ -700,6 +708,22 @@
         state = BAL_CHAMBER_STATE2_FILL_START;
     }
 
+    // Clear the switching only on request flag.
+    balanceChamberSwitchingOnlyOnRequested = FALSE;
+
+    // Check if switching only off was requested
+    if ( TRUE == balanceChamberSwitchingOnlyOffRequested )
+    {
+        // Clear the Switch only off request flag
+        balanceChamberSwitchingOnlyOffRequested = FALSE;
+
+        //Clear the switch only flag
+        setBalChamberSwitchingOnlyStatus( FALSE );
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
+    }
+
     // Keep Clearing the On request flag in case an On request was made while the switching is active
     isBalChamberSwitchingOnRequested =  FALSE;
 
@@ -811,6 +835,10 @@
     if ( ( balChamberFillTimeoutCount > 0 ) && ( currentBalChamberFillCounter > balChamberFillTimeoutCount ) )
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_BC_FILL_TIMEOUT_FAULT, currentBalChamberFillCounter, balChamberFillTimeoutCount );
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
+
     }
 
     // Spent side of balancing chamber fill is complete or not
@@ -845,9 +873,10 @@
  * The handleBalChamberState2FillEnd function check for the balancing chamber
  * switching period complete and transition to next state.
  * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod,
- * isBalChamberSwitchingOffRequested
+ * isBalChamberSwitchingOffRequested, balanceChamberSwitchingOnlyOffRequested
  * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress,
- * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive
+ * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive,
+ * balanceChamberSwitchingOnlyOffRequested
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE
  * when pressure is not in range during balacing chamber state 2 fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE
@@ -905,6 +934,22 @@
             isFirstCycleBCSwitchingCompleted = TRUE;
         }
 
+    // Clear the switching only on request flag.
+    balanceChamberSwitchingOnlyOnRequested = FALSE;
+
+    // Check if switching only off was requested
+    if ( TRUE == balanceChamberSwitchingOnlyOffRequested )
+    {
+        // Clear the Switch only off request flag
+        balanceChamberSwitchingOnlyOffRequested = FALSE;
+
+        //Clear the switch only flag
+        setBalChamberSwitchingOnlyStatus( FALSE );
+
+        // Move to the idle state
+        state = BAL_CHAMBER_STATE_IDLE;
+    }
+
     // Keep Clearing the On request flag in case an On request was made while the switching is active
     isBalChamberSwitchingOnRequested =  FALSE;
 
@@ -933,6 +978,25 @@
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE_IDLE;
 
+    // Clear the switching only off request flag.
+    balanceChamberSwitchingOnlyOffRequested = FALSE;
+
+    // Check if the switching only on was requested
+    if ( TRUE == balanceChamberSwitchingOnlyOnRequested )
+    {
+        // Clear the switching only on request flag.
+        balanceChamberSwitchingOnlyOnRequested = FALSE;
+
+        // then set BC switching only flag to ignore pressure check and dosing.
+        setBalChamberSwitchingOnlyStatus( TRUE );
+
+        // Set flag to indicate that balancing chamber switching is active
+        isBalChamberSwitchingActive = TRUE;
+
+        // Move to the start state1
+        state = BAL_CHAMBER_STATE1_FILL_START;
+    }
+
     // Keep Clearing the off request flag in case an off request was made while we were already in the idle state
     isBalChamberSwitchingOffRequested =  FALSE;
 
@@ -1281,17 +1345,18 @@
                 setTDDialysateFlowrate( payload.flowrate );
                 // update switching rate
                 transitionToBalChamberFill();
-                // then set BC switching only flag to ignore pressure check and dosing.
-                setBalChamberSwitchingOnlyStatus( TRUE );
+                // Set the flag to indicate that a request was made to start the switching only
+                balanceChamberSwitchingOnlyOnRequested = TRUE;
                 // Now, if the current operating mode is standby mode idle state, execute the balancing chamber switching only control
                 result = requestBCSwitchingOnlyStart();
             }
 
             //Handle stop command
             if ( FALSE == payload.startStop )
             {
-                //Reset the flag
-                setBalChamberSwitchingOnlyStatus( FALSE );
+                // Set the flag to indicate that a request was made to stop the switching only
+                balanceChamberSwitchingOnlyOffRequested = TRUE;
+
                 //Stop the BC switching execution only control
                 requestBCSwitchingOnlyStop();
                 result = TRUE;