diff options
| author | Avi Levkovich <avi@twine-s.com> | 2021-01-04 11:52:20 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2021-01-04 11:52:20 +0200 |
| commit | 7c3e54578ae6f2c01ec05ebc7f7e0f873955bb33 (patch) | |
| tree | 3eb92323c29633dde9df39666ece64815ff7da98 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 6a2aa48d486a9f83449d7e2c5e85b62649763c49 (diff) | |
| parent | b0dc79e93c1a17667211bff5c7e48eb2d69ad386 (diff) | |
| download | Tango-7c3e54578ae6f2c01ec05ebc7f7e0f873955bb33.tar.gz Tango-7c3e54578ae6f2c01ec05ebc7f7e0f873955bb33.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 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index c5fffff60..f9401c248 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -618,7 +618,7 @@ uint16_t realtimetest[101]; uint16_t dbgflag[50]; uint32_t dbttime[50]; bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m90msecTick, Onesecond_Tick,Tensecond_Tick,OneMinute_Tick,TenMinutes_Tick,OneHourTick,Gradient_Tick; -bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick; +bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick,m50msecTick; uint32_t MillisecLowLoop(uint32_t tick) { @@ -636,7 +636,7 @@ uint32_t MillisecLowLoop(uint32_t tick) Fifty_msTick = (tick%eHundredMillisecond == 40) ?true:false; //eFiftyMillisecond Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false; m20msecTick = (tick%eHundredMillisecond == 20) ?true:false; - //m70msecTick = (tick%eHundredMillisecond == 70) ?true:false; + m50msecTick = (tick%50== 0) ?true:false; m90msecTick = (tick%eHundredMillisecond == 90) ?true:false; O700Millisecond_Tick = (tick%eOneSecond == 700) ?true:false; O200Millisecond_Tick = (tick%eOneSecond == 200) ?true:false; @@ -672,6 +672,14 @@ uint32_t MillisecLowLoop(uint32_t tick) dbgflag[2]++; dbttime[2] = msec_millisecondCounter; Read_Dryer_ENC_Position(); + dbgflag[3]++; + } + if (m50msecTick) //50 milli + { +#ifdef USE_UART4_FOR_BTSR + //call every 50mSec + BTSR_State_Machine(RUFeeder1); +#endif } if (m20msecTick) { @@ -682,11 +690,6 @@ uint32_t MillisecLowLoop(uint32_t tick) WHS_Read_GPI_Registers(); Trigger_PT100_Read();//call every 50mSec (minimum delay 30mSec) //Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec) - - #ifdef USE_UART4_FOR_BTSR - //call every 50mSec - BTSR_State_Machine(RUFeeder1); - #endif } if (m90msecTick) { |