diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-27 16:50:17 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-27 16:50:17 +0200 |
| commit | cb36c0b1ff561c072a1a63a8d184899336249e16 (patch) | |
| tree | f2ee360184add1ba17074212d6d2e80587b6baf1 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 2ab54573d10ca59351100ab8416178be2223fc91 (diff) | |
| parent | da1b671bef36b771d7c417baadd8156287d481d2 (diff) | |
| download | Tango-cb36c0b1ff561c072a1a63a8d184899336249e16.tar.gz Tango-cb36c0b1ff561c072a1a63a8d184899336249e16.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 2689ea34a..a82fe37e6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -199,6 +199,7 @@ return OK; } uint8_t CallbackCounter = 0; + uint8_t TimeoutsCounter = 0; uint32_t Thread_Load_HomingCallback(uint32_t MotorId, uint32_t ReadValue) { Report("Thread Load State Machine Callback.",__FILE__,__LINE__,LoadStages,RpMessage,NumberOfDrierLoaderCycles,0); @@ -206,12 +207,25 @@ if (CallbackCounter) { CallbackCounter--; + if (ReadValue != LIMIT) + { + //returned with a timeout + TimeoutsCounter++; + } if (CallbackCounter == 0) { - LoadStages++; - if (LoadStages != THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call + if (TimeoutsCounter) { - //ThreadLoadStateMachine(LoadStages); + LOG_ERROR(LoadStages,"Load sequence timeout"); + TimeoutsCounter = 0; + } + else + { + LoadStages++; + if (LoadStages != THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call + { + ThreadLoadStateMachine(LoadStages); + } } } } @@ -326,7 +340,7 @@ { Control_Dryer_Fan(START,75);//use START or STOP, 0 - 100% LoadStages++; - //ThreadLoadStateMachine(LoadStages); + ThreadLoadStateMachine(LoadStages); } return OK; } @@ -357,7 +371,7 @@ LoadStages++; if (LoadStages != THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call { - //ThreadLoadStateMachine(LoadStages); + ThreadLoadStateMachine(LoadStages); } } } @@ -414,7 +428,7 @@ ControlId = 0xFF; ThreadAbortJoggingFunc(); LoadStages++; - //ThreadLoadStateMachine(LoadStages); + ThreadLoadStateMachine(LoadStages); return OK; } uint32_t Thread_Load_Jog_Thread(void) |