Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -rd210786d6c7d75bb0b4d9e18efc40a01d85123fe -r1ec300286e48139883010047b1ac5aac5befd8d1 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision d210786d6c7d75bb0b4d9e18efc40a01d85123fe) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 1ec300286e48139883010047b1ac5aac5befd8d1) @@ -7,8 +7,8 @@ * * @file TaskGeneral.c * -* @author (last) Sameer Kalliadan Poyil -* @date (last) 06-Feb-2026 +* @author (last) Michael Garthwaite +* @date (last) 14-Jul-2026 * * @author (original) Vinayakam Mani * @date (original) 07-Aug-2024 @@ -18,20 +18,24 @@ #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" #include "ROPump.h" #include "SystemCommDD.h" #include "TaskGeneral.h" #include "WatchdogMgmt.h" +#include "Voltages.h" /** * @addtogroup TaskGeneral @@ -80,26 +84,32 @@ execConcentratePumpMonitor(); // Monitor DD voltages - ///execVoltagesMonitor(); + execVoltagesMonitor(); // 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 ) + 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(); @@ -123,7 +133,7 @@ // Run non-volatile data management state machine that sends the data record // to Dialin - //execNVDataMgmtProcessRecord(); + execNVMProcessRecord(); // Run alarm management execAlarmMgmt();