diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-29 14:43:11 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-29 14:43:11 +0200 |
| commit | 5a1fafe5ba74f32fcabaf25466c046527ff2384e (patch) | |
| tree | 07f313e2f25d2e58f3abd48794e176611bf20d6e /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 1fabacea3865a285f34a706a4a83006a7e59fb50 (diff) | |
| parent | bb541d734bae59614659fe1c4bc4bbe2f85d16d0 (diff) | |
| download | Tango-5a1fafe5ba74f32fcabaf25466c046527ff2384e.tar.gz Tango-5a1fafe5ba74f32fcabaf25466c046527ff2384e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index c3f15aff8..8a3b20e57 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1132,9 +1132,13 @@ 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; - //if (LoadStages > THREAD_LOAD_INITIAL_TENSION) - // ThreadLoadingRestartReport(); - ThreadLoadStateMachine(LoadStages+1); + if (LoadStages == THREAD_LOAD_LIFT_DANCERS) + { + LoadStages++; + LoadStatus = OK; + } + else + ThreadLoadStateMachine(LoadStages+1); } else //((SecondTry == false)&&(TryAgain == false))??????? { |