diff options
| author | Mirta <mirta@twine-s.com> | 2019-05-14 14:43:14 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2019-05-14 14:43:14 +0300 |
| commit | d13a20a4ab738e1f96fb94aa192d9b925ad2e164 (patch) | |
| tree | d1c55eafe9facf87cb1ebd7e89dd5a418bdefe98 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 06b6cec9375af3951117ffec9206c47f354b7ad8 (diff) | |
| parent | 5326f66bf1b6ebd7519087d7811a55d193e8542f (diff) | |
| download | Tango-d13a20a4ab738e1f96fb94aa192d9b925ad2e164.tar.gz Tango-d13a20a4ab738e1f96fb94aa192d9b925ad2e164.zip | |
MERGE.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 6 |
1 files changed, 4 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..e0350935a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -237,6 +237,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) if (WinderMotorSpeedRollOver == false) { Add100 = true; + LOG_ERROR(Add100, "Add100 = true"); } WinderMotorSpeedCounter=0; WinderMotorSpeedRollOver=true; @@ -289,7 +290,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; @@ -387,6 +388,7 @@ uint32_t Winder_Presegment(void *SegmentDetails, uint32_t SegmentId) TotalWinderSpeed = 0; WinderMotorSpeedRollOver=false; Add100 = false; + LOG_ERROR(Add100, "Add100 = false"); } PreSegmentReady(Module_Winder,ModuleDone); @@ -479,7 +481,7 @@ void ScrewTimerInterrupt(int ARG0) TimerDisable(Screw_timerBase, TIMER_A); } ROM_IntMasterEnable(); - Rotations+=0.03; + Rotations+=0.005; return ; |
