diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-13 09:59:23 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-13 09:59:23 +0300 |
| commit | d7530fe9e5c7e95c59966fd548200cb1e80ff07b (patch) | |
| tree | e29f99c376b7b02a75bc751bd18e0fbe32753965 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | b778891ca9be6127fcf076f123ffff86caecc3bd (diff) | |
| parent | 0ff51a85762ca79d40a2a17262b381d898586223 (diff) | |
| download | Tango-d7530fe9e5c7e95c59966fd548200cb1e80ff07b.tar.gz Tango-d7530fe9e5c7e95c59966fd548200cb1e80ff07b.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index df88db3f9..06597ee84 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -289,7 +289,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) WinderReferenceSpeed = Averagewinderspeed; } screw_horizontal_speed = ScrewNumberOfSteps / Rotations;//InternalWinderCfg.NumberOfRotationPerPassage; - if (Rotations > 7.0) + if (Rotations > 6.4)//7.0) Rotations = 6.0; RotationsPerSecond = WinderReferenceSpeed / (double)MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; tempScrewSpeed = screw_horizontal_speed*RotationsPerSecond; @@ -479,7 +479,7 @@ void ScrewTimerInterrupt(int ARG0) TimerDisable(Screw_timerBase, TIMER_A); } ROM_IntMasterEnable(); - Rotations+=0.03; + Rotations+=0.005; return ; |