Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r7c29e738c37a25cc72d68686d852e087f2f1577d -ra2180eecf9ed0c62849131ee19715c04d2dcbf22
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 7c29e738c37a25cc72d68686d852e087f2f1577d)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision a2180eecf9ed0c62849131ee19715c04d2dcbf22)
@@ -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_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
@@ -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;
@@ -312,13 +316,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;
 
@@ -359,6 +363,8 @@
 {
     if( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE )
     {
+        updatedConcentrateControlInterval();
+
         // closed loop bicarb and acid mixing controller
         handleDialysateCompositionMixing();
     }
@@ -425,6 +431,36 @@
 
 /*********************************************************************//**
  * @brief
+ * The updatedConcentrateControlInterval 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 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;
+
+    // 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
@@ -1099,7 +1135,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;
 }
@@ -1116,7 +1152,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;
 }