aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-05-16 11:58:10 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-05-16 11:58:10 +0300
commit30fcfa4100a9d00e887c6e17e32e427b05296ce7 (patch)
tree0810375ae9424acca748b6538e7d1cf706dbb3a4 /Software/Embedded_SW/Embedded/Modules/Thread
parent62b3546679aab27fc35b0955608c24ad37619258 (diff)
parent4fdb3d2406b16a95e15fe24d6f562e666b3258af (diff)
downloadTango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.tar.gz
Tango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.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.c6
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..f8b0efb17 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.6)//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.01;
return ;