Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r11fcfaffab49f00f358124c8c285a821632eba24 -rcd4dd9f9928825dd673856bd6cf51ae47576ff79 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 11fcfaffab49f00f358124c8c285a821632eba24) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision cd4dd9f9928825dd673856bd6cf51ae47576ff79) @@ -7,8 +7,8 @@ * * @file TaskGeneral.c * -* @author (last) Arpita Srivastava -* @date (last) 08-Apr-2026 +* @author (last) Michael Garthwaite +* @date (last) 14-Jul-2026 * * @author (original) Vinayakam Mani * @date (original) 07-Aug-2024 @@ -26,6 +26,7 @@ #include "Heaters.h" #include "FPOperationModes.h" #include "Messaging.h" +#include "MixingControl.h" #include "OperationModes.h" #include "PermeateTank.h" #include "RinsePump.h" @@ -34,6 +35,7 @@ #include "SystemCommDD.h" #include "TaskGeneral.h" #include "WatchdogMgmt.h" +#include "Voltages.h" /** * @addtogroup TaskGeneral @@ -82,7 +84,7 @@ execConcentratePumpMonitor(); // Monitor DD voltages - ///execVoltagesMonitor(); + execVoltagesMonitor(); // run DD operation mode state machine execDDOperationModes(); @@ -99,12 +101,15 @@ // 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 Substitution pump execSubstitutionPumpController();