Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -re13152777df58456a873789fbfc3f889813109c9 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision e13152777df58456a873789fbfc3f889813109c9) @@ -7,23 +7,25 @@ * * @file TaskPriority.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 "Accel.h" +#include "Accel.h" +#include "AirTrap.h" #include "BloodFlow.h" #include "Buttons.h" #include "CPLD.h" #include "DialInFlow.h" #include "DialOutFlow.h" #include "FPGA.h" #include "InternalADC.h" -#include "SystemComm.h" +#include "SystemComm.h" +#include "Valves.h" #include "WatchdogMgmt.h" #include "TaskPriority.h" @@ -36,9 +38,8 @@ * @brief * The taskPriority function handles the scheduled Priority Task interrupt. * Calls the executive functions for FPGA, pumps, valves, and buttons. - * @details - * Inputs : none - * Outputs : Executive for the FPGA, pumps, valves, and buttons called. + * @details Inputs: none + * @details Outputs: Executive for the FPGA, pumps, valves, and buttons called. * @return none *************************************************************************/ void taskPriority( void ) @@ -61,7 +62,10 @@ execButtons(); // monitor internal ADC channels - execInternalADC(); + execInternalADC(); + + // monitor air trap level sensors + execAirTrapMonitor(); // monitor blood pump and flow execBloodFlowMonitor(); @@ -76,6 +80,8 @@ // monitor accelerometer execAccel(); #endif + // Exec and monitor valves + execValves(); #endif // 2nd pass for FPGA execFPGAOut();