diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-07 14:22:29 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-07 14:22:29 +0300 |
| commit | 449c7faf0b98369994736862e16b086e680c4d2e (patch) | |
| tree | 93b31e7046a95196e4e315f4a6bce00b5416c6d7 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 84103e5dd222064c4a81c62515186766e134f057 (diff) | |
| parent | 70fe24a9044c15f44968d1e4936e4c0b510ef372 (diff) | |
| download | Tango-449c7faf0b98369994736862e16b086e680c4d2e.tar.gz Tango-449c7faf0b98369994736862e16b086e680c4d2e.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index d5c186893..6edc5b3f2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1109,6 +1109,8 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue) } Report("ThreadLoadButton",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0); Report("ThreadLoadButton params",__FILE__,LoadStatus,TryAgain,RpMessage,SecondTry,0); + if (LoadStages == THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call + MessageState = 2; ThreadLoadingReport(); if (LoadStatus == ERROR) { @@ -1407,8 +1409,6 @@ uint32_t ThreadLoadingReport(void) if (ThreadLoadingToken[0] == 0) return OK; - if (LoadStages == THREAD_LOAD_INIT) - return OK; if (MessageState == 0) { |