Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
Printrun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
Printrun
Commits
e89eba8c
Commit
e89eba8c
authored
Nov 04, 2011
by
Steven Devijver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use latest feedrate, no need to fall back
parent
05003322
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
pronsole.py
pronsole.py
+4
-11
No files found.
pronsole.py
View file @
e89eba8c
...
@@ -89,10 +89,10 @@ def get_coordinate_value(axis, parts):
...
@@ -89,10 +89,10 @@ def get_coordinate_value(axis, parts):
def
estimate_duration
(
g
):
def
estimate_duration
(
g
):
extra_cost_per_movement
=
0.0
5
extra_cost_per_movement
=
0.0
2
total_duration
=
0
total_duration
=
0
fallback_feedrate
=
0
initial_feedrate
=
0
initial_feedrate
=
0
feedrate
=
0
X_last_position
=
0
X_last_position
=
0
Y_last_position
=
0
Y_last_position
=
0
for
i
in
g
:
for
i
in
g
:
...
@@ -103,16 +103,9 @@ def estimate_duration(g):
...
@@ -103,16 +103,9 @@ def estimate_duration(g):
F
=
get_coordinate_value
(
"F"
,
parts
[
1
:])
F
=
get_coordinate_value
(
"F"
,
parts
[
1
:])
E
=
get_coordinate_value
(
"E"
,
parts
[
1
:])
E
=
get_coordinate_value
(
"E"
,
parts
[
1
:])
if
(
X
is
None
and
Y
is
None
and
E
is
None
and
F
is
not
None
):
if
(
F
is
not
None
):
fallback_feedrate
=
F
continue
feedrate
=
0
if
(
F
is
None
):
feedrate
=
fallback_feedrate
/
60
else
:
feedrate
=
F
/
60
feedrate
=
F
/
60
distance
=
0
distance
=
0
if
(
X
is
None
and
Y
is
None
and
E
is
not
None
):
if
(
X
is
None
and
Y
is
None
and
E
is
not
None
):
distance
=
abs
(
E
)
distance
=
abs
(
E
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment