Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -re13152777df58456a873789fbfc3f889813109c9 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision e13152777df58456a873789fbfc3f889813109c9) @@ -7,14 +7,15 @@ * * @file TaskGeneral.c * -* @author (last) Sean Nash -* @date (last) 24-Aug-2020 +* @author (last) Dara Navaei +* @date (last) 30-Sep-2020 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 * ***************************************************************************/ - + +#include "AirTrap.h" #include "AlarmLamp.h" #include "BloodFlow.h" #include "CPLD.h" @@ -23,7 +24,7 @@ #include "OperationModes.h" #include "PresOccl.h" #include "SystemComm.h" -#include "SystemCommMessages.h" +#include "SystemCommMessages.h" #include "WatchdogMgmt.h" #include "TaskGeneral.h" #include "RTC.h" @@ -46,9 +47,8 @@ * The taskGeneral function handles the scheduled General Task interrupt. * Calls the executive functions for most monitors and controllers, the * operation modes, the system communications, and alarms. - * @details - * Inputs : none - * Outputs : Executive for the TBD called. + * @details Inputs: none + * @details Outputs: Executive for the TBD called. * @return none *************************************************************************/ void taskGeneral( void ) @@ -73,7 +73,10 @@ execPresOccl(); // run operation mode state machine - execOperationModes(); + execOperationModes(); + + // control air trap valve + execAirTrapController(); // control blood pump execBloodFlowController();