Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r145fd716a856f864f39fb0f9884865f6e45b9256 -r313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 145fd716a856f864f39fb0f9884865f6e45b9256)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59)
@@ -69,8 +69,8 @@
 
 #define MIX_NO_FEED_FORWARD                         0.0F                                                    ///< Feed forward term for dialysate closed loop control
 
-#define BICARB_MIX_CONTROL_INTERVAL                 ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )          ///< Interval (ms/task time) at which the bicarb mix is controlled.
-#define ACID_MIX_CONTROL_INTERVAL                   ( 9 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the dialysate mix is controlled.
+#define BICARB_MIX_CONTROL_INTERVAL                 ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the bicarb mix is controlled.
+#define ACID_MIX_CONTROL_INTERVAL                   ( 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
@@ -201,6 +201,7 @@
 
 static void setBicarbMixVol( F32 targetValue );
 static void setAcidMixVol( F32 targetValue );
+static void updatedConcentrateControlInterval( void );
 
 static F32 getBicarbDeltaConductivity( void );
 static F32 getBicarbTargetConductivity( void );
@@ -257,6 +258,9 @@
      mixingControlBicarbVolume.ovInitData                   = 0.0F;
      mixingControlBicarbVolume.override                     = OVERRIDE_RESET;
 
+     lastAcidMixVolume                                      = DEFAULT_ACID_VOLUME_ML;
+     lastBicarbMixVolume                                    = DEFAULT_BICARB_VOLUME_ML;
+
      mixingControlAcidVolumeKpGain.data                     = ACID_VOL_CONTROL_P_COEFFICIENT;
      mixingControlAcidVolumeKpGain.ovData                   = ACID_VOL_CONTROL_P_COEFFICIENT;
      mixingControlAcidVolumeKpGain.ovInitData               = 0.0F;
@@ -351,6 +355,8 @@
 {
     if( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE )
     {
+        updatedConcentrateControlInterval();
+
         // closed loop bicarb and acid mixing controller
         handleDialysateCompositionMixing();
     }
@@ -417,6 +423,32 @@
 
 /*********************************************************************//**
  * @brief
+ * The updatedConcentrateControlInterval function sets 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 updatedConcentrateControlInterval( void )
+{
+    F32 tdDialysateFlowRate = 0.0F;
+    F32 balChamberSwitchingFreq = 0.0F;
+    U32 balChamberSwitchingPeriod = 0;
+
+    tdDialysateFlowRate = getTDDialysateFlowrate();
+
+    balChamberSwitchingFreq = tdDialysateFlowRate / 30.0;
+    balChamberSwitchingPeriod = ( SEC_PER_MIN ) / (U32)balChamberSwitchingFreq;
+
+    if ( balChamberSwitchingPeriod > 0)
+    {
+        mixingControlAcidControlInterval.data = ACID_MIX_CONTROL_INTERVAL * balChamberSwitchingPeriod;
+        mixingControlBicarbControlInterval.data = BICARB_MIX_CONTROL_INTERVAL * balChamberSwitchingPeriod;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The getBicarbDeltaConductivity function gets the delta target conductivity
  * @details \b Inputs: mixingControlBicarbDeltaConductivity
  * @details \b Outputs: none