Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r1fb58baf6e7e3d1f054b2a3634e233da7609dad9 -r1a685471524555a374854c0c9ec8e208e71fe2df --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 1fb58baf6e7e3d1f054b2a3634e233da7609dad9) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) @@ -8,14 +8,15 @@ * @file TaskPriority.c * * @author (last) Sean Nash -* @date (last) 24-Aug-2020 +* @date (last) 14-Oct-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" @@ -37,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 ) @@ -62,7 +62,10 @@ execButtons(); // monitor internal ADC channels - execInternalADC(); + execInternalADC(); + + // monitor air trap level sensors + execAirTrapMonitor(); // monitor blood pump and flow execBloodFlowMonitor(); @@ -77,8 +80,10 @@ // monitor accelerometer execAccel(); #endif +#ifndef DISABLE_3WAY_VALVES // Exec and monitor valves execValves(); +#endif #endif // 2nd pass for FPGA execFPGAOut();