Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rbce6e6d1cfb6e8a0b186419416460ead3a44e5e1 -r313982ccc772f1bbe182877dff7e00381b04e0f4 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision bce6e6d1cfb6e8a0b186419416460ead3a44e5e1) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) @@ -15,20 +15,20 @@ * ***************************************************************************/ -#include "gio.h" - +#include "gio.h" + #include "Conductivity.h" -#include "DialysatePumps.h" -#include "FPGA.h" -#include "Heaters.h" +#include "DialysatePumps.h" +#include "FPGA.h" +#include "Heaters.h" #include "InternalADC.h" #include "Level.h" #include "ModeGenDialysate.h" -#include "Pressure.h" -#include "TaskPriority.h" -#include "Temperature.h" -#include "Valves.h" -#include "WatchdogMgmt.h" +#include "Pressure.h" +#include "TaskPriority.h" +#include "Temperature.h" +#include "Valves.h" +#include "WatchdogMgmt.h" /** * @addtogroup TaskPriority @@ -42,64 +42,65 @@ #define SET_TASK_OFF() { mibspiREG3->PC3 &= ~TASK_TIMING_TEST_PIN_SPI1_PORT_MASK; } #endif -/*********************************************************************//** - * @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 for the FPGA, pumps, valves, and buttons called. - * @note This task runs every 10 ms interval. - *************************************************************************/ -void taskPriority( void ) -{ + * @note This task runs every 10 ms interval. + *************************************************************************/ +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 #ifndef BOARD_WITH_NO_HARDWARE - // First pass for FPGA + // First pass for FPGA execFPGA( TRUE ); - - // Monitor internal ADC channels - execInternalADC(); + //TODO : Enable later Temperature, Conductivity, Heaters, Internal ADC and FPGA clock speed + // Monitor internal ADC channels + //execInternalADC(); + //Monitor Level sensor - execLevels(); - - // Monitor pressures - execPressureSensor(); + execLevels(); - // Monitor temperatures - execTemperatureSensors(); + // Monitor pressures + execPressureSensor(); + // Monitor temperatures + execTemperatureSensors(); + // Verify the processor clock speed against the FPGA clock //execFPGAClockSpeedTest(); // Read/write Conductivity sensors - execConductivity(); - - // Control valves - execValves(); + //execConductivity(); - // Monitor dialysate pump - execDialysatePumpMonitor(); - - // Heaters monitor + // Control valves + execValves(); + + // Monitor dialysate pump + execDialysatePumpMonitor(); + + // Heaters monitor execHeatersMonitor(); // Dialysate generation monitor execGenDialysateMonitor(); - // Second pass for FPGA + // Second pass for FPGA execFPGA( FALSE ); -#endif - - // Check in with watchdog manager - checkInWithWatchdogMgmt( TASK_PRIORITY ); - +#endif + + // 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 -} +} -/**@}*/ +/**@}*/