Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -r1d44cf33cf4461b81b19a8ab0e402c609649786b --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 8b56b0c617ac49536b8d53852b9621be873bade6) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 1d44cf33cf4461b81b19a8ab0e402c609649786b) @@ -16,11 +16,18 @@ #include "gio.h" +#include "DrainPump.h" #include "FPGA.h" #include "InternalADC.h" #include "LoadCell.h" -#include "WatchdogMgmt.h" +#include "Pressures.h" +#include "ROPump.h" #include "TaskPriority.h" +#include "TemperatureSensors.h" +#include "Valves.h" +#include "WatchdogMgmt.h" +#include "TemperatureSensors.h" +#include "Heaters.h" /************************************************************************* * @brief taskPriority @@ -38,16 +45,38 @@ // monitor internal ADC channels execInternalADC(); - // load cells monitor +#ifndef CAN_TEST + // monitor pressures + execPressures(); + + // monitor load cells execLoadCell(); +#ifndef DISABLE_HEATERS_AND_TEMPS + // Temperature sensors read + execTemperatureSensors(); +#endif + + // control valves + execValves(); + + // monitor RO pump + execROPumpMonitor(); + + // monitor drain pump + execDrainPumpMonitor(); + + // Heaters monitor + execHeatersMonitor(); +#endif + // 2nd pass for FPGA execFPGAOut(); // check in with watchdog manager checkInWithWatchdogMgmt( TASK_PRIORITY ); // toggle GPIO to indicate priority task has executed -// gioToggleBit( gioPORTB, 3 ); + //gioToggleBit( gioPORTB, 3 ); }