aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-14 10:17:23 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-14 10:17:23 +0300
commit709f074dcd5cde75434fdb5c46b71e1cfcb22612 (patch)
treef2db75c40f1ab7127bee5df70818aa0160aaf244 /Software/Embedded_SW/Embedded/Modules/Control
parent5a1081358fb466d4368715c22b70b439251d8b30 (diff)
parent87437f979da7baf9a65d98140b361ee85d6966d5 (diff)
downloadTango-709f074dcd5cde75434fdb5c46b71e1cfcb22612.tar.gz
Tango-709f074dcd5cde75434fdb5c46b71e1cfcb22612.zip
MERGE
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index ec4e336cd..9ce05b485 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -380,7 +380,7 @@ uint32_t MillisecLoop(uint32_t tick)
ScrewSetMaxSpeedPending.Active = false;
if (ScrewSetMaxSpeedPending.Callback)
ScrewSetMaxSpeedPending.Callback(Motor_i,0);
-
+ continue;
}
else if (ScrewMovePending.Active == true)
{
@@ -391,7 +391,7 @@ uint32_t MillisecLoop(uint32_t tick)
ScrewMovePending.Active = false;
if (ScrewMovePending.Callback)
ScrewMovePending.Callback(Motor_i,0);
-
+ continue;
}
}
if (SpeedSetPending[Motor_i].Active == true)