aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-12 19:00:59 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-12 19:00:59 +0300
commit72edcc9e0261a227017e394302a6eb47197a5868 (patch)
tree185aebdc969e7879ed3f8da04277d5274bb03e77 /Software/Embedded_SW/Embedded/Modules/Control
parent18fc4053deb06af6643f28a6bb4fd66c6a9a93e0 (diff)
parent819b2bc2094baac1ddf4e6e84cd308e96eb17d8e (diff)
downloadTango-72edcc9e0261a227017e394302a6eb47197a5868.tar.gz
Tango-72edcc9e0261a227017e394302a6eb47197a5868.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 559db0e79..25f826d92 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -179,6 +179,7 @@ int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, MSecFptr Callback)
PT100Activity++; //get response
PT100Activity++; //read request
PT100Data[TempSensorId].Callback = Callback;
+ PT100Data[TempSensorId].WaitForData = true;
PT100Data[TempSensorId].DataRequired = true;
PT100Data[TempSensorId].Active = true;
@@ -343,7 +344,7 @@ uint32_t MillisecLoop(uint32_t tick)
{
TemperatureSendSensorDummyClk((TEMPERATURE_SENSOR_ID_ENUM)Sensor_i);
PT100Data[Sensor_i].SyncRequired = false;
- if (PT100Data[Sensor_i].DataRequired == true)
+ /*if (PT100Data[Sensor_i].DataRequired == true)
{
PT100Data[Sensor_i].WaitForData = true; // mark the motor for data request next round
}
@@ -351,7 +352,7 @@ uint32_t MillisecLoop(uint32_t tick)
{
if (PT100Data[Sensor_i].Callback)
PT100Data[Sensor_i].Callback(Sensor_i,0); // call the callback to report execution
- }
+ }*/
PT100Activity--;
}