Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rf308cc4c35eab630ebbbde405cfe47d049afeafb -ra00c45d75f2edf679c9a30d20b9d75beb46d0a48 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision f308cc4c35eab630ebbbde405cfe47d049afeafb) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision a00c45d75f2edf679c9a30d20b9d75beb46d0a48) @@ -8,7 +8,7 @@ * @file TaskPriority.c * * @author (last) Quang Nguyen -* @date (last) 13-Jul-2020 +* @date (last) 25-Aug-2020 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -18,8 +18,11 @@ #include "gio.h" #include "Accel.h" -#include "DrainPump.h" +#include "ConductivitySensors.h" +#include "DrainPump.h" +#include "FluidLeak.h" #include "FPGA.h" +#include "Heaters.h" #include "InternalADC.h" #include "LoadCell.h" #include "Pressures.h" @@ -28,76 +31,81 @@ #include "TemperatureSensors.h" #include "Valves.h" #include "WatchdogMgmt.h" -#include "TemperatureSensors.h" -#include "ConductivitySensors.h" -#include "Heaters.h" +/** + * @addtogroup TaskPriority + * @{ + */ + #ifdef TASK_TIMING_OUTPUT_ENABLED #include "mibspi.h" #define TASK_TIMING_TEST_PIN_SPI1_PORT_MASK 0x00000020 // (CS5 - re-purposed as output GPIO) #define SET_TASK_ON() { mibspiREG3->PC3 |= TASK_TIMING_TEST_PIN_SPI1_PORT_MASK; } #define SET_TASK_OFF() { mibspiREG3->PC3 &= ~TASK_TIMING_TEST_PIN_SPI1_PORT_MASK; } #endif -/************************************************************************* - * @brief taskPriority - * The taskPriority function handles the scheduled Priority Task interrupt. +/*********************************************************************//** + * @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 // SET_TASK_OFF(); // TODO - uncomment and define TASK_TIMING_OUTPUT_ENABLED to monitor this tasks timing #endif } - + +/**@}*/