diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-25 18:29:51 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-25 18:29:51 +0300 |
| commit | 051e3ca3f4039ec0d23408d9940b90bde1b4e857 (patch) | |
| tree | 2486df93b0bb7950aaf8f92fc145617ba58af049 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | d990cf35a8816c7447fef4552ee83d041466636d (diff) | |
| parent | 18cb19e1a4f998bec498d509e755a1deb7ffd455 (diff) | |
| download | Tango-051e3ca3f4039ec0d23408d9940b90bde1b4e857.tar.gz Tango-051e3ca3f4039ec0d23408d9940b90bde1b4e857.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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 1575123e4..9ad42d739 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -307,7 +307,7 @@ //Open Dyeing Head Cover And Dryer Lid //HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2, //HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4, - DeActivateHeadMagnet(); + //DeActivateHeadMagnet(); CallbackCounter++; MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DH_LID,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DH_LID].directionthreadwize, 200, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID], Thread_Load_HomingCallback,10000); CallbackCounter++; @@ -719,6 +719,11 @@ } uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue) { + if (JobIsActive()) + { + Report("ThreadLoadButton called on job",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0); + return ERROR; + } Report("ThreadLoadButton",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0); if (LoadStages > ReadValue) { |