diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-26 13:24:31 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-26 13:24:31 +0200 |
| commit | 6b223bcd7f7e1e0b76a33ecd00c17d7b846c91a9 (patch) | |
| tree | 832169bbbb3fb93063230b8c767f6f6ac777f3ca /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | |
| parent | a64cfe8b7dec8417a3d380b55f4ae79c5459f49d (diff) | |
| parent | 5cedf7cc7de176c6b3ecdcef9b7ad1382400e880 (diff) | |
| download | Tango-6b223bcd7f7e1e0b76a33ecd00c17d7b846c91a9.tar.gz Tango-6b223bcd7f7e1e0b76a33ecd00c17d7b846c91a9.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 78092ae2b..78150e9f9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -213,9 +213,16 @@ uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue) REPORT_MSG(millisecondCounter/*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].maxfrequency*/, "Winder_PrepareStage2"); if (ReadValue != LIMIT) { - LOG_ERROR(ReadValue,"Screw failed to reach the limit switch!!"); - //returned with a timeout - Winder_ScrewAtOffsetCallback(0,0); + if (JobIsActive()==true) + { + LOG_ERROR(ReadValue,"Screw failed to reach the limit switch!!"); + //returned with a timeout + Winder_ScrewAtOffsetCallback(0,0); + } + else //short jog, etc + { + AlarmHandlingSetAlarm (EVENT_TYPE__SCREW_MOTOR_LIMIT_TIMEOUT,OFF); //on a short jog, this callback will be called without need + } } else { |