nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using the new estimator in vector math for gcode timing

Browse source
This commit is contained in:
Lars Brubaker 2018-09-19 18:20:05 -07:00
parent 8a00c397d5
commit 56ad74ecc7
3 changed files with 16 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

17
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -402,8 +402,21 @@ namespace MatterControl.Printing
if (feedRateMmPerMin > 0)
{
instruction.secondsThisLine = (float)GetSecondsThisLine(deltaPositionThisLine, deltaEPositionThisLine, feedRateMmPerMin,
maxAccelerationMmPerS2, maxVelocityMmPerS, velocitySameAsStopMmPerS, speedMultiplier);
var timeForE = Estimator.GetSecondsForMovement(deltaEPositionThisLine,
feedRateMmPerMin / 60.0,
maxAccelerationMmPerS2[3],
maxVelocityMmPerS[3],
velocitySameAsStopMmPerS[3],
speedMultiplier[3]);
var timeForPosition = Estimator.GetSecondsForMovement(deltaPositionThisLine,
feedRateMmPerMin / 60.0,
new Vector3(maxAccelerationMmPerS2),
new Vector3(maxVelocityMmPerS),
new Vector3(velocitySameAsStopMmPerS),
new Vector3(speedMultiplier));
instruction.secondsThisLine = (float)Math.Max(timeForE, timeForPosition);
}
if (progressReporter != null && maxProgressReport.ElapsedMilliseconds > 200)