Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r90334b92aa0ebe0c6795e649abf82ff808036004 -ra00c45d75f2edf679c9a30d20b9d75beb46d0a48 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 90334b92aa0ebe0c6795e649abf82ff808036004) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision a00c45d75f2edf679c9a30d20b9d75beb46d0a48) @@ -7,8 +7,8 @@ * * @file TaskPriority.c * -* @author (last) Sean Nash -* @date (last) 19-Aug-2020 +* @author (last) Quang Nguyen +* @date (last) 25-Aug-2020 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -19,7 +19,8 @@ #include "Accel.h" #include "ConductivitySensors.h" -#include "DrainPump.h" +#include "DrainPump.h" +#include "FluidLeak.h" #include "FPGA.h" #include "Heaters.h" #include "InternalADC.h" @@ -47,57 +48,59 @@ * @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. *************************************************************************/ void taskPriority( void ) { #ifdef TASK_TIMING_OUTPUT_ENABLED // SET_TASK_ON(); // TODO - uncomment and define TASK_TIMING_OUTPUT_ENABLED to monitor this tasks timing #endif - // 1st pass for FPGA + // First pass for FPGA execFPGAIn(); - // monitor internal ADC channels + // Monitor internal ADC channels execInternalADC(); - // monitor pressures + // Monitor pressures execPressures(); - // monitor load cells + // Monitor load cells execLoadCell(); #ifndef DISABLE_HEATERS_AND_TEMPS // Temperature sensors read execTemperatureSensors(); #endif - // conductivity sensors read - execConductivitySensors(); + // Conductivity sensors read + execConductivitySensors(); - // control valves + // Control valves execValves(); #ifndef DISABLE_ACCELS - // monitor accelerometer + // Monitor accelerometer execAccel(); #endif - // monitor RO pump + // Monitor RO pump execROPumpMonitor(); - // monitor drain pump + // Monitor drain pump execDrainPumpMonitor(); // Heaters monitor - execHeatersMonitor(); + execHeatersMonitor(); - // 2nd pass for FPGA + // Monitor fluid leak detector + execFluidLeak(); + + // Second pass for FPGA execFPGAOut(); - // check in with watchdog manager + // Check in with watchdog manager checkInWithWatchdogMgmt( TASK_PRIORITY ); #ifdef TASK_TIMING_OUTPUT_ENABLED