q3k
/
Printrun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115 from cakeller98/master 

Complete rewrite of time estimation with acceleration
master
kliment 2011-12-07 05:05:52 -08:00
parent 9b52df1daf f2434e75b5
commit d9193e4444
1 changed files with 113 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
pronsole.py
View File

@ -2,7 +2,9 @@
import cmd, printcore, sys import cmd, printcore, sys
import glob, os, time import glob, os, time
import sys, subprocess import sys, subprocess
import math
from math import sqrt from math import sqrt
if os.name=="nt": if os.name=="nt":
try: try:
import _winreg import _winreg
@ -22,51 +24,50 @@ def dosify(name):
return os.path.split(name)[1].split(".")[0][:8]+".g" return os.path.split(name)[1].split(".")[0][:8]+".g"
def measurements(g): def measurements(g):
Xcur=0.0 Xcur=0.0
Ycur=0.0 Ycur=0.0
Zcur=0.0 Zcur=0.0
Xmin=1000000 Xmin=1000000
Ymin=1000000 Ymin=1000000
Zmin=1000000 Zmin=1000000
Xmax=-1000000 Xmax=-1000000
Ymax=-1000000 Ymax=-1000000
Zmax=-1000000 Zmax=-1000000
Xtot=0 Xtot=0
Ytot=0 Ytot=0
Ztot=0 Ztot=0
for i in g: for i in g:
if "X" in i and ("G1" in i or "G0" in i): if "X" in i and ("G1" in i or "G0" in i):
try: try:
Xcur = float(i.split("X")[1].split(" ")[0]) Xcur = float(i.split("X")[1].split(" ")[0])
if Xcur<Xmin and Xcur>5.0: Xmin=Xcur if Xcur<Xmin and Xcur>5.0: Xmin=Xcur
if Xcur>Xmax: Xmax=Xcur if Xcur>Xmax: Xmax=Xcur
except: except:
pass pass
if "Y" in i and ("G1" in i or "G0" in i): if "Y" in i and ("G1" in i or "G0" in i):
try: try:
Ycur = float(i.split("Y")[1].split(" ")[0]) Ycur = float(i.split("Y")[1].split(" ")[0])
if Ycur<Ymin and Ycur>5.0: Ymin=Ycur if Ycur<Ymin and Ycur>5.0: Ymin=Ycur
if Ycur>Ymax: Ymax=Ycur if Ycur>Ymax: Ymax=Ycur
except: except:
pass pass
if "Z" in i and ("G1" in i or "G0" in i): if "Z" in i and ("G1" in i or "G0" in i):
try: try:
Zcur = float(i.split("Z")[1].split(" ")[0]) Zcur = float(i.split("Z")[1].split(" ")[0])
if Zcur<Zmin: Zmin=Zcur if Zcur<Zmin: Zmin=Zcur
if Zcur>Zmax: Zmax=Zcur if Zcur>Zmax: Zmax=Zcur
except: except:
pass pass
Xtot = Xmax - Xmin Xtot = Xmax - Xmin
Ytot = Ymax - Ymin Ytot = Ymax - Ymin
Ztot = Zmax - Zmin Ztot = Zmax - Zmin
return (Xtot,Ytot,Ztot,Xmin,Xmax,Ymin,Ymax,Zmin,Zmax)
return (Xtot,Ytot,Ztot,Xmin,Xmax,Ymin,Ymax,Zmin,Zmax)
def totalelength(g): def totalelength(g):
tot=0 tot=0
@ -86,59 +87,77 @@ def get_coordinate_value(axis, parts):
if (axis in i): if (axis in i):
return float(i[1:]) return float(i[1:])
return None return None
def hypot3d(X1, Y1, Z1, X2=0.0, Y2=0.0, Z2=0.0):
return math.hypot(X2-X1, math.hypot(Y2-Y1, Z2-Z1))
def estimate_duration(g): def estimate_duration(g):
extra_cost_per_movement = 0.02
total_duration = 0.0 lastx = lasty = lastz = laste = lastf = 0.0
feedrate = 0.0 x = y = z = e = f = 0.0
avg_feedrate = 0.0 currenttravel = 0.0
last_feedrate = 0.0 totaltravel = 0.0
X_last_position = 0.0 moveduration = 0.0
Y_last_position = 0.0 totalduration = 0.0
Z_last_position = 0.0 acceleration = 1500.0 #mm/s/s ASSUMING THE DEFAULT FROM SPRINTER !!!!
layerduration = 0.0
layerbeginduration = 0.0
#TODO:
# get device caps from firmware: max speed, acceleration/axis (including extruder)
# calculate the maximum move duration accounting for above ;)
print ".... estimating ...."
for i in g: for i in g:
i=i.split(";")[0] if "G4" in i or "G1" in i:
if "G1" in i and ("X" in i or "Y" in i or "F" in i or "E" in i): if "G4" in i:
#if "G1" in i and ("X" in i or "Y" in i or "Z" in i or "F" in i or "E" in i): parts = i.split(" ")
parts = i.split(" ") moveduration = get_coordinate_value("P", parts[1:])
X = get_coordinate_value("X", parts[1:]) if moveduration is None:
Y = get_coordinate_value("Y", parts[1:]) continue
#Z = get_coordinate_value("Z", parts[1:]) else:
F = get_coordinate_value("F", parts[1:]) moveduration /= 1000.0
E = get_coordinate_value("E", parts[1:]) if "G1" in i:
parts = i.split(" ")
x = get_coordinate_value("X", parts[1:])
if x is None: x=lastx
y = get_coordinate_value("Y", parts[1:])
if y is None: y=lasty
z = get_coordinate_value("Z", parts[1:])
if z is None: z=lastz
e = get_coordinate_value("E", parts[1:])
if e is None: e=laste
f = get_coordinate_value("F", parts[1:])
if f is None: f=lastf
else: f /= 60.0 # mm/s vs mm/m
# given last feedrate and current feedrate calculate the distance needed to achieve current feedrate.
# if travel is longer than req'd distance, then subtract distance to achieve full speed, and add the time it took to get there.
# then calculate the time taken to complete the remaining distance
if (F is not None): currenttravel = hypot3d(x, y, z, lastx, lasty, lastz)
feedrate = (last_feedrate + (F / 60.0))/2.0 distance = 2* ((lastf+f) * (f-lastf) * 0.5 ) / acceleration #2x because we have to accelerate and decelerate
distance = 0 if distance <= currenttravel:
if (X is None and Y is None and E is not None): moveduration = 2 * distance / ( lastf + f )
distance = abs(E) currenttravel -= distance
elif (X is not None and Y is None): moveduration += currenttravel/f
distance = X - X_last_position else:
X_last_position = X moveduration = math.sqrt( 2 * distance / acceleration )
elif (X is None and Y is not None):
distance = Y - Y_last_position totalduration += moveduration
Y_last_position = Y
elif (X is not None and Y is not None): if z > lastz:
X_distance = X - X_last_position print "layer z: ", lastz, " will take: ", time.strftime('%H:%M:%S', time.gmtime(totalduration-layerbeginduration))
Y_distance = Y - Y_last_position layerbeginduration = totalduration
distance = sqrt(X_distance * X_distance + Y_distance * Y_distance)
X_last_position = X lastx = x
Y_last_position = Y lasty = y
#if (Z is not None): lastz = z
# Z_distance = Z - Z_last_position laste = e
# if not(distance == 0.0): lastf = f
# distance = sqrt(Z_distance * Z_distance + distance * distance )
# else: print "Total Duration: " #, time.strftime('%H:%M:%S', time.gmtime(totalduration))
# distance = Z_distance return time.strftime('%H:%M:%S', time.gmtime(totalduration))
# Z_last_position = Z
if (feedrate == 0.0 or distance == 0.0): continue
time_for_move = distance / feedrate
total_duration += time_for_move + extra_cost_per_movement
if (F is not None): feedrate = F / 60.0
return time.strftime('%H:%M:%S', time.gmtime(total_duration/60.0))
class Settings: class Settings:
#def _temperature_alias(self): return {"pla":210,"abs":230,"off":0} #def _temperature_alias(self): return {"pla":210,"abs":230,"off":0}
#def _temperature_validate(self,v): #def _temperature_validate(self,v):