Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r051326e2671e8d5b3e99eaa109ea549e94a929f3 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 051326e2671e8d5b3e99eaa109ea549e94a929f3) @@ -15,11 +15,17 @@ * ***************************************************************************/ +#include "AirPump.h" +#include "AirTrap.h" +#include "BloodFlow.h" #include "Messaging.h" #include "OperationModes.h" -#include "SystemComm.h" +#include "Pressures.h" +#include "Switches.h" #include "SystemCommTD.h" #include "TaskGeneral.h" +#include "Valves.h" +#include "Voltages.h" #include "WatchdogMgmt.h" /** @@ -57,40 +63,46 @@ if ( ( TRUE == uiCommunicated() ) || ( ( FALSE == isOnlyCANNode() ) && ( TRUE == isAlarmActive( ALARM_ID_TD_UI_COMM_POST_FAILED ) ) ) ) { -// // Monitor voltages -// execVoltagesMonitor(); -// -// // Monitor DD + // Monitor voltages + execVoltagesMonitor(); + + // Monitor DD // execDDInterfaceMonitor(); -// -// // Monitor pressure sensors -// execPressures(); -// -// // Monitor switches -// execSwitches(); -// -// // Monitor temperatures + + // Monitor pressure sensors + execPressure(); + + // Monitor switches + execSwitches(); + + // Monitor temperatures // execTemperatures(); -// -// // Monitor processor RAM status + + // Monitor processor RAM status // execRAMMonitor(); + // Monitor blood pump/flow + execBloodFlowMonitor(); + // Run operation mode state machine execOperationModes(); -// // Control air trap valve -// execAirTrapController(); -// -// // Control blood pump -// execBloodFlowController(); -// -// // Control Air Pump -// execAirPumpController(); -// -// // Monitor/Control fan + // Control air trap valve + execAirTrapController(); + + // Control pinch valves + execValvesController(); + + // Control blood pump + execBloodFlowController(); + + // Control Air Pump + execAirPumpController(); + + // Monitor/Control fan // execFan(); -// -// // Manage NVDataMgmt process record state machine + + // Manage NVDataMgmt process record state machine // execNVDataMgmtProcessRecord(); // Manage alarm state