diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-01 00:38:46 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-01 00:38:46 +0200 |
| commit | 58046c61675b0cdafa36370790976b4889e84d5d (patch) | |
| tree | 92ff1adfc1158e3478673f998e519797d01320d7 /Software/Embedded_SW/Embedded | |
| parent | 06f6e9025818ff953151edbbffaeaa7959046482 (diff) | |
| download | Tango-58046c61675b0cdafa36370790976b4889e84d5d.tar.gz Tango-58046c61675b0cdafa36370790976b4889e84d5d.zip | |
thread loading fixes
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c index ae862505a..4722bfe2f 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c +++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c @@ -253,7 +253,7 @@ uint32_t MotorRunWithCallback (TimerMotors_t MotorId,bool direction, uint32_t Fr uint32_t MotorRunCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) //TODO { uint32_t MotorId,encoder,temp = 0; - uint32_t Busy = BusyFlag; + uint32_t Busy = BUSY; int angle; if (IfIndex>>8 != IfTypeMotors) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 8a3b20e57..f2ca4e8d7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1132,10 +1132,10 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue) SecondTry = false; Report("Calling State machine 2nd try",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0); load.color = BLINK; + LoadStatus = OK; if (LoadStages == THREAD_LOAD_LIFT_DANCERS) { LoadStages++; - LoadStatus = OK; } else ThreadLoadStateMachine(LoadStages+1); |