aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-13 11:06:50 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-13 11:06:50 +0300
commitfc43b9d6ed5770eaf1496acba8fe7ecd3eb5410c (patch)
tree72a62b24640aad7ad9f3607005ea47b48e5af3e5 /Software/Embedded_SW/Embedded/Modules/Control
parent349c18600a2c6c5077bb339b0137f9e37882e06f (diff)
parentacde45615085df2a8ca4286f55f42ea16aee1943 (diff)
downloadTango-fc43b9d6ed5770eaf1496acba8fe7ecd3eb5410c.tar.gz
Tango-fc43b9d6ed5770eaf1496acba8fe7ecd3eb5410c.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 58d3f9889..9212eb501 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -181,6 +181,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;
@@ -345,7 +346,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
}
@@ -353,7 +354,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--;
}