Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a -r56100135135bb715d316b5fd002a4a4951b9334a --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 56100135135bb715d316b5fd002a4a4951b9334a) @@ -22,63 +22,60 @@ #include "InternalADC.h" #include "SystemCommTD.h" #include "TaskPriority.h" -#include "WatchdogMgmt.h" - +#include "WatchdogMgmt.h" + /** * @addtogroup TaskPriority * @{ */ -/*********************************************************************//** - * @brief - * The taskPriority function handles the scheduled Priority Task interrupt. - * Calls the executive functions for FPGA, pumps, valves, and buttons. - * @details \b Inputs: none +/*********************************************************************//** + * @brief + * The taskPriority function handles the scheduled Priority Task interrupt. + * Calls the executive functions for FPGA, pumps, valves, and buttons. + * @details \b Inputs: none * @details \b Outputs: Executive functions running in priority task are called. - * @return none - *************************************************************************/ -void taskPriority( void ) + * @return none + *************************************************************************/ +void taskPriority( void ) { #ifdef TASK_TIMING_OUTPUT_ENABLED // Set GPIO high to indicate priority task has begun executing setCPLDLampRed( PIN_SIGNAL_HIGH ); #endif - // Prevent most processing until UI has started communicating - if ( TRUE == uiCommunicated() ) + // Prevent most processing until UI has started communicating + if ( TRUE == uiCommunicated() ) { - // 1st pass for FPGA + // 1st pass for FPGA execFPGA( TRUE ); - + // Verify processor clock speed against FPGA clock // execFPGAClockSpeedTest(); - - // Monitor and process buttons - execButtons(); - - // Monitor internal ADC channels + + // Monitor and process buttons + execButtons(); + + // Monitor internal ADC channels execInternalADC(); // Monitor air trap level sensors execAirTrapMonitor(); - // Monitor blood pump and flow -// execBloodFlowMonitor(); - // Monitor air bubble detectors execBubbles(); - // 2nd pass for FPGA + // 2nd pass for FPGA execFPGA( FALSE ); - } - - // Check in with watchdog manager - checkInWithWatchdogMgmt( TASK_PRIORITY ); + } + // Check in with watchdog manager + checkInWithWatchdogMgmt( TASK_PRIORITY ); + #ifdef TASK_TIMING_OUTPUT_ENABLED // Set GPIO low to indicate priority task has finished executing setCPLDLampRed( PIN_SIGNAL_LOW ); #endif -} +} -/**@}*/ +/**@}*/