Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59 -rde5e503e4adc38658ac9d15cdad2b755a3ce566b
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision de5e503e4adc38658ac9d15cdad2b755a3ce566b)
@@ -69,8 +69,8 @@
 
 #define MIX_NO_FEED_FORWARD                         0.0F                                                    ///< Feed forward term for dialysate closed loop control
 
-#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_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
@@ -316,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;
 
@@ -423,7 +423,8 @@
 
 /*********************************************************************//**
  * @brief
- * The updatedConcentrateControlInterval function sets bicarb Mix volume provided by the controller
+ * 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
@@ -440,10 +441,13 @@
     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 * balChamberSwitchingPeriod;
-        mixingControlBicarbControlInterval.data = BICARB_MIX_CONTROL_INTERVAL * balChamberSwitchingPeriod;
+        mixingControlAcidControlInterval.data = ACID_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod;
+        mixingControlBicarbControlInterval.data = BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod;
     }
 }
 
@@ -1119,7 +1123,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;
 }
@@ -1136,7 +1140,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;
 }