Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -r11fcfaffab49f00f358124c8c285a821632eba24
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 11fcfaffab49f00f358124c8c285a821632eba24)
@@ -1,28 +1,36 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    TaskGeneral.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      05-Aug-2024
+* @author  (last)      Arpita Srivastava
+* @date    (last)      08-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  05-Aug-2024
+* @date    (original)  07-Aug-2024
 *
 ***************************************************************************/
 
 #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 "OperationModes.h"
+#include "PermeateTank.h"
+#include "RinsePump.h"
+#include "ROPump.h"
+#include "SubstitutionPump.h"
 #include "SystemCommDD.h"
 #include "TaskGeneral.h"
 #include "WatchdogMgmt.h"
@@ -76,21 +84,48 @@
     // Monitor DD voltages
     ///execVoltagesMonitor();
 
-    // run operation mode state machine
-    execOperationModes();
+    // run DD operation mode state machine
+    execDDOperationModes();
 
+    // 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 )
+    {
+        // manage drybicart state machines
+        execDryBicart();
+    }
+
+    // Control Substitution pump
+    execSubstitutionPumpController();
+
+    // Control RO pump
+    execROPumpController();
+
+    // Control Permeate Tank
+    execPermeateTankController();
+
+    // Control Boost pump
+    execBoostPumpController();
+
     // Manage switches monitor
     //execSwitches();
 
     // Heaters controller
     execHeatersControl();
 
+    // manage rinse pump
+    execRinsePumpController();
+
     // Monitor RAM error status
     //execRAMMonitor();