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
7f69b8d4
Commit
7f69b8d4
authored
Jan 26, 2014
by
Guillaume Seguin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #474 (G4 parsing was lagging behind gcoder changes)
parent
e6fc52ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
gcoder.py
printrun/gcoder.py
+8
-7
No files found.
printrun/gcoder.py
View file @
7f69b8d4
...
...
@@ -494,11 +494,12 @@ class GCode(object):
if
line
.
command
not
in
[
"G1"
,
"G0"
,
"G4"
]:
continue
if
line
.
command
==
"G4"
:
moveduration
=
line
.
p
moveduration
=
P
(
line
)
if
not
moveduration
:
continue
else
:
moveduration
/=
1000.0
totalduration
+=
moveduration
else
:
x
=
line
.
x
if
line
.
x
is
not
None
else
lastx
y
=
line
.
y
if
line
.
y
is
not
None
else
lasty
...
...
@@ -552,13 +553,13 @@ class GCode(object):
lastdx
=
dx
lastdy
=
dy
totalduration
+=
moveduration
totalduration
+=
moveduration
lastx
=
x
lasty
=
y
lastz
=
z
laste
=
e
lastf
=
f
lastx
=
x
lasty
=
y
lastz
=
z
laste
=
e
lastf
=
f
layer
.
duration
=
totalduration
-
layerbeginduration
layerbeginduration
=
totalduration
...
...
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