3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

D6: Fixed dual extrusion E value

Browse source
This commit is contained in:
Victor Larchenko 2016-12-07 11:56:38 +06:00 • committed by Youness Alaoui
parent ba372f69a7
commit afc9b71279
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/GCodeReader/GCodeReader.py
View file

@ -130,11 +130,11 @@ class GCodeReader(MeshReader):
self._prev_z = z self._prev_z = z
z = zp z = zp
if ep is not None: if ep is not None:
if ep > e: if ep > e[self._extruder]:
path.append([x, y, z, self._layer_type]) # extrusion path.append([x, y, z, self._layer_type]) # extrusion
else: else:
path.append([x, y, z, LayerPolygon.MoveRetractionType]) # retraction path.append([x, y, z, LayerPolygon.MoveRetractionType]) # retraction
e = ep e[self._extruder] = ep
else: else:
path.append([x, y, z, LayerPolygon.MoveCombingType]) path.append([x, y, z, LayerPolygon.MoveCombingType])
if z_changed: if z_changed:
@ -157,10 +157,12 @@ class GCodeReader(MeshReader):
def _gCode92(self, position, params, path): def _gCode92(self, position, params, path):
x, y, z, e = position x, y, z, e = position
xp, yp, zp, ep = params xp, yp, zp, ep = params
if ep is not None:
e[self._extruder] = ep
return (xp if xp is not None else x, return (xp if xp is not None else x,
yp if yp is not None else y, yp if yp is not None else y,
zp if zp is not None else z, zp if zp is not None else z,
ep if ep is not None else e) e)
_gCode1 = _gCode0 _gCode1 = _gCode0
@ -217,7 +219,7 @@ class GCodeReader(MeshReader):
Logger.log("d", "Parsing %s" % file_name) Logger.log("d", "Parsing %s" % file_name)
current_position = (0, 0, 0, 0) # x, y, z, e current_position = (0, 0, 0, [0, 0]) # x, y, z, e
current_path = [] current_path = []
for line in file: for line in file: