aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-12-18 09:02:04 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-12-18 09:02:04 +0200
commita61a911d1ebde107ba7bf210af7e753e692d93e2 (patch)
tree95355ea06f74b4a6a685e7fd2b1510b9d72c3d51 /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
parent1b92f30f6dfa27392ffd8460ebeb17c17550db7b (diff)
parent615bc666c8d0618d93bc4401a74928535c2cc7f6 (diff)
downloadTango-a61a911d1ebde107ba7bf210af7e753e692d93e2.tar.gz
Tango-a61a911d1ebde107ba7bf210af7e753e692d93e2.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index b5fff9340..862a0f8cf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -580,10 +580,11 @@ uint32_t MillisecLowLoop(uint32_t tick)
//call all modules Millisec functions
//test dancers and speed encoders
//check all callback units (state machine waiting for completion of a change)
- bool Ten_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,OneMinute_Tick,OneHourTick;
+ bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,OneMinute_Tick,OneHourTick;
bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick;
//bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick,O900Millisecond_Tick;
Ten_msTick = (tick%eTenMillisecond == 0) ?true:false;
+ Fifty_msTick = (tick%eHundredMillisecond == 0) ?true:false; //eFiftyMillisecond
Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false;
m20msecTick = (tick%eHundredMillisecond == 20) ?true:false;
m70msecTick = (tick%eHundredMillisecond == 70) ?true:false;
@@ -612,6 +613,12 @@ uint32_t MillisecLowLoop(uint32_t tick)
Machine_Idle_Breathing_Led();
}
#ifdef Use_Head_Card
+ if(Fifty_msTick)
+ {
+ Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec)
+ }
+#endif
+#ifdef Use_Head_Card
if (m20msecTick) //read odd PT1000
{
for (Sensor_i = HEAD_PT100_ZONE_1_0X80_0;Sensor_i < HEAD_PT100_ZONE_2_0X80_1;Sensor_i++)
@@ -670,6 +677,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
}
DispensersCollectionCall();
+#ifdef Use_Head_Card
+ Head_Read_IO_Reg(0x46, HIGH);//READ HEAD CARD LS
+#endif
+
}
if (O100Millisecond_Tick)
{