diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-02-20 15:13:52 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-02-20 15:13:52 +0200 |
| commit | 229a982d232b818ec0260d25b86451b7726f6061 (patch) | |
| tree | c9867f7520fb26113176f7e3ce53da9edaa79c90 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | e213a2f2e87d7853e1385f6fb0d0ae4dae8b90e6 (diff) | |
| parent | 53daee7d858e4795d681ebd8641bd370eb36dadc (diff) | |
| download | Tango-229a982d232b818ec0260d25b86451b7726f6061.tar.gz Tango-229a982d232b818ec0260d25b86451b7726f6061.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index fe350d78d..1cc8e766b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -671,6 +671,7 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (O200Millisecond_Tick) { + Trigger_WHS_MAX11614_Read_allADC(); FPGA_GetAllDispensersValveBusyOCD(); temp = Read_Fans_Tacho(); DrawerFansStatus = temp & 0x1F; @@ -692,6 +693,7 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (O600Millisecond_Tick) { + Trigger_WHSReadAllFanTacho (); if (RapidPressureRead == false) { for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++) @@ -720,20 +722,21 @@ uint32_t MillisecLowLoop(uint32_t tick) PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i); } } - Trigger_WHS_PT100_Read_All(); - Trigger_WHS_MAX11614_Read_allADC(); - WHS_Blower_Avarege_ORF1(); //drier - WHS_Blower_Avarege_ORF3(); //head - Trigger_WHSReadAllFanTacho (); - WHS_Start_Blower_Control_Closed_Loop (); + if (WHS_Type == WHS_TYPE_NEW) + { + Trigger_WHS_PT100_Read_All(); + WHS_Blower_Avarege_ORF1(); //drier + WHS_Blower_Avarege_ORF3(); //head + WHS_Start_Blower_Control_Closed_Loop (); + } } if (OneMinute_Tick) { - Trigger_MidTank_Pressure_Read(); - /*for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++) + //Trigger_MidTank_Pressure_Read(); + for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++) { Read_MidTank_Pressure_Sensor(Disp_i); - }*/ + } // MachineUpdateResponseFunc(); /* for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { |