Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r1fa38184526c2b0c072eb8745c653f772156a824 -r3b84fc79b2fd6c7a447e54e4fe821447f613af59
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 1fa38184526c2b0c072eb8745c653f772156a824)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 3b84fc79b2fd6c7a447e54e4fe821447f613af59)
@@ -8,24 +8,26 @@
 * @file    TaskGeneral.c
 *
 * @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      06-Feb-2026
+* @date    (last)      24-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
 *
 ***************************************************************************/
 
-#include <NVMgmt.h>
 #include "gio.h"
 #include "lin.h"
 
+#include "BalancingChamber.h"
 #include "BoostPump.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "DryBiCart.h"
 #include "Heaters.h"
 #include "FPOperationModes.h"
 #include "Messaging.h"
+#include "MixingControl.h"
+#include "NVMgmt.h"
 #include "OperationModes.h"
 #include "PermeateTank.h"
 #include "RinsePump.h"
@@ -89,18 +91,24 @@
     // run FP operation mode state machine
     execFPOperationModes();
 
+    // Balancing chamber switching control
+    execBalancingChamberControl();
+
     // manage dialysate pump
     execDialysatePumpController();
 
     // manage concentrate pumps
     execConcentratePumpController();
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) )
     {
-        // manage drybicart state machines
+        // Control drybicart fill, supply , drain and depressurize state machines
         execDryBicart();
     }
 
+    // Control closed loop mixing of bicarb and acid
+    execMixingControl();
+
     // Control RO pump
     execROPumpController();