Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r64f2edc1b7ec8edda7e500b10c09c2a54dc70fc9 -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 64f2edc1b7ec8edda7e500b10c09c2a54dc70fc9) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a) @@ -16,12 +16,15 @@ ***************************************************************************/ #include "AirPump.h" +#include "AirTrap.h" #include "Messaging.h" #include "OperationModes.h" +#include "PeristalticPump.h" #include "Pressures.h" #include "Switches.h" #include "SystemCommTD.h" #include "TaskGeneral.h" +#include "Valves.h" #include "Voltages.h" #include "WatchdogMgmt.h" @@ -63,7 +66,7 @@ // Monitor voltages execVoltagesMonitor(); -// // Monitor DD + // Monitor DD // execDDInterfaceMonitor(); // Monitor pressure sensors @@ -72,28 +75,34 @@ // Monitor switches execSwitches(); -// // Monitor temperatures + // Monitor temperatures // execTemperatures(); -// -// // Monitor processor RAM status + + // Monitor processor RAM status // execRAMMonitor(); + // Monitor peristaltic pump(s) + readPeristalticPumps(); + // Run operation mode state machine execOperationModes(); -// // Control air trap valve -// execAirTrapController(); -// -// // Control blood pump + // Control air trap valve + execAirTrapController(); + + // Control pinch valves + execValvesController(); + + // Control blood pump // execBloodFlowController(); -// + // Control Air Pump execAirPumpController(); -// // Monitor/Control fan + // Monitor/Control fan // execFan(); -// -// // Manage NVDataMgmt process record state machine + + // Manage NVDataMgmt process record state machine // execNVDataMgmtProcessRecord(); // Manage alarm state