Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rbd522c8ffdf75130571e5b6a79d1b1d6acd78b1c -r917d510b37f14e22cde8c28b223f8e4894aeda94
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision bd522c8ffdf75130571e5b6a79d1b1d6acd78b1c)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 917d510b37f14e22cde8c28b223f8e4894aeda94)
@@ -46,8 +46,8 @@
 #define MIXING_CONTROL_DATA_PUBLISH_INTERVAL        ( 250 / TASK_GENERAL_INTERVAL )                         ///< Interval (ms/task time) at which the mixing control data published.
 
 // drybicarb mixing
-#define BICARB_VOL_CONTROL_P_COEFFICIENT            ( 0.00008484F * 2 )                                     ///< Bicarb proportional gain (kp)
-#define BICARB_VOL_CONTROL_I_COEFFICIENT            ( 0.00033936F / 4 )                                     ///< Bicarb integral gain. (ki)
+#define BICARB_VOL_CONTROL_P_COEFFICIENT            ( 0.00008484F )                                         ///< Bicarb proportional gain (kp)
+#define BICARB_VOL_CONTROL_I_COEFFICIENT            ( 0.00033936F / 8 )                                     ///< Bicarb integral gain. (ki)
 #define MIN_BICARB_VOLUME_ML                        0.4F                                                    ///< Minimum bicarb volume in mL
 #define MAX_BICARB_VOLUME_ML                        1.8F                                                    ///< Maximum bicarb volume in mL
 
@@ -69,11 +69,11 @@
 
 #define MIX_NO_FEED_FORWARD                         0.0F                                                    ///< Feed forward term for dialysate closed loop control
 
-#define BICARB_MIX_CONTROL_INTERVAL                 ( 9 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the bicarb mix is controlled.
-#define ACID_MIX_CONTROL_INTERVAL                   ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )          ///< Interval (ms/task time) at which the dialysate mix is controlled.
+#define BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER      ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the bicarb mix is controlled.
+#define ACID_MIX_CONTROL_INTERVAL_MULTIPLIER        ( 5 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the dialysate mix is controlled.
 
-#define BICARB_DEADBAND_CONTROL                     15.0F                                                   ///< Bicarb dead band control
-#define ACID_DEADBAND_CONTROL                       50.0F                                                   ///< Acid dead band control
+#define BICARB_DEADBAND_CONTROL                     30.0F                                                   ///< Bicarb dead band control
+#define ACID_DEADBAND_CONTROL                       70.0F                                                   ///< Acid dead band control
 
 // Proportioning Ratios: 1 Part Acid : 1.72 Parts Bicarb : 42.28 Parts Water
 // Total parts = 1 + 1.72 + 42.28 = 45.0
@@ -201,6 +201,7 @@
 
 static void setBicarbMixVol( F32 targetValue );
 static void setAcidMixVol( F32 targetValue );
+static void updatedCMixingControlInterval( void );
 
 static F32 getBicarbDeltaConductivity( void );
 static F32 getBicarbTargetConductivity( void );
@@ -312,13 +313,13 @@
      mixingControlTargetAdjBicarbSettings.ovInitData        = 0.0F;
      mixingControlTargetAdjBicarbSettings.override          = OVERRIDE_RESET;
 
-     mixingControlBicarbControlInterval.data                = BICARB_MIX_CONTROL_INTERVAL;
-     mixingControlBicarbControlInterval.ovData              = BICARB_MIX_CONTROL_INTERVAL;
+     mixingControlBicarbControlInterval.data                = BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER;
+     mixingControlBicarbControlInterval.ovData              = BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER;
      mixingControlBicarbControlInterval.ovInitData          = 0;
      mixingControlBicarbControlInterval.override            = OVERRIDE_RESET;
 
-     mixingControlAcidControlInterval.data                  = ACID_MIX_CONTROL_INTERVAL;
-     mixingControlAcidControlInterval.ovData                = ACID_MIX_CONTROL_INTERVAL;
+     mixingControlAcidControlInterval.data                  = ACID_MIX_CONTROL_INTERVAL_MULTIPLIER;
+     mixingControlAcidControlInterval.ovData                = ACID_MIX_CONTROL_INTERVAL_MULTIPLIER;
      mixingControlAcidControlInterval.ovInitData            = 0;
      mixingControlAcidControlInterval.override              = OVERRIDE_RESET;
 
@@ -361,6 +362,8 @@
 {
     if ( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE )
     {
+        updatedCMixingControlInterval();
+
         // closed loop bicarb and acid mixing controller
         handleDialysateCompositionMixing();
     }
@@ -427,6 +430,36 @@
 
 /*********************************************************************//**
  * @brief
+ * The updatedCMixingControlInterval function sets both acid and bicarb
+ * Mix volume provided by the controller
+ * @details \b Inputs: none
+ * @details \b Outputs: mixingControlBicarbMixVolume
+ * @param targetValue bicarb Mix volume
+ * @return TRUE if successful, FALSE if not.
+ *************************************************************************/
+static void updatedCMixingControlInterval( void )
+{
+    F32 tdDialysateFlowRate = 0.0F;
+    F32 balChamberSwitchingFreq = 0.0F;
+    U32 balChamberSwitchingPeriod = 0;
+
+    tdDialysateFlowRate = getTDDialysateFlowrate();
+
+    balChamberSwitchingFreq = tdDialysateFlowRate / 30.0;
+    balChamberSwitchingPeriod = ( SEC_PER_MIN ) / (U32)balChamberSwitchingFreq;
+
+    // For acid control period, we are using 3 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so acid control interval = 3*3 = 9sec
+    // For bicarb control period, we are using 5 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so bicarb control interval = 3*5 = 15sec
+
+    if ( balChamberSwitchingPeriod > 0)
+    {
+        mixingControlAcidControlInterval.data = ACID_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod;
+        mixingControlBicarbControlInterval.data = BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The getBicarbDeltaConductivity function gets the delta target conductivity
  * @details \b Inputs: mixingControlBicarbDeltaConductivity
  * @details \b Outputs: none
@@ -1114,7 +1147,7 @@
  *************************************************************************/
 BOOL testMixingControlBicarbControlIntervalOverride( MESSAGE_T *message )
 {
-    BOOL result = u32Override( message, &mixingControlBicarbControlInterval, 0, BICARB_MIX_CONTROL_INTERVAL  );
+    BOOL result = u32Override( message, &mixingControlBicarbControlInterval, 0, BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER  );
 
     return result;
 }
@@ -1131,7 +1164,7 @@
  *************************************************************************/
 BOOL testMixingControlAcidControlIntervalOverride( MESSAGE_T *message )
 {
-    BOOL result = u32Override( message, &mixingControlAcidControlInterval, 0, BICARB_MIX_CONTROL_INTERVAL  );
+    BOOL result = u32Override( message, &mixingControlAcidControlInterval, 0, ACID_MIX_CONTROL_INTERVAL_MULTIPLIER  );
 
     return result;
 }