diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-01-31 14:14:54 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-01-31 14:14:54 +0200 |
| commit | d53cf58d139b3682948f8fa82f3614ae86dbd18b (patch) | |
| tree | 68c1b5101629da622ce438234d1e3d3b53cf6c9a /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | f11b4598d2d50ffa0836d208c4cd9ceb647ed2ae (diff) | |
| parent | ab1666760ca315fd9ecaeb5642a9ad42b26b6e15 (diff) | |
| download | Tango-d53cf58d139b3682948f8fa82f3614ae86dbd18b.tar.gz Tango-d53cf58d139b3682948f8fa82f3614ae86dbd18b.zip | |
merge
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, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index e19431abd..58ade0802 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -215,6 +215,7 @@ //Open Dyeing Head Cover And Dryer Lid //HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2, //HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4, + 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++; @@ -288,6 +289,8 @@ } uint32_t Thread_Load_Resume_Heating(void) { + ActivateHeadMagnet(); + if (HandleProcessParameters(&ProcessParametersRecover)!= OK) { LOG_ERROR (LoadStages, "Thread_Load_Resume_Heating failed"); @@ -429,7 +432,6 @@ uint32_t ThreadLoadControlCBFunction(uint32_t index, uint32_t ReadValue) //double tempcalcspeed = 0; uint32_t calculated_speed; double NormalizedError; - //char Message[60]; DancerId = ThreadMotorIdToDancerId[index]; if (ReadValue < 10) |