diff options
| author | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
| commit | 2d2568104e8aaef6b90575284bf2e65315395da0 (patch) | |
| tree | 836c9ccd3d19a9b4097e5513fd6e2fd68e58f3c5 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 4902057feed8887c9ae5e05a1e618a1d085b6dde (diff) | |
| parent | ce5c7688337926ded0ee0778819f26b668cfc1d7 (diff) | |
| download | Tango-2d2568104e8aaef6b90575284bf2e65315395da0.tar.gz Tango-2d2568104e8aaef6b90575284bf2e65315395da0.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index d5c186893..d0d2c1ef7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -16,7 +16,7 @@ #include "Modules/Control/control.h" #include "Modules/General/process.h" #include "Modules/control/pidalgo.h" - +#include "Modules/AlarmHandling/AlarmHandling.h" #include "Modules/heaters/heaters_ex.h" #include "Modules/General/buttons.h" #include "StateMachines/Initialization/InitSequence.h" @@ -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) { |