bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added to the postprocessor files the command after toolchange to go with G00 (fastest) to "Z Move" value of Z pozition.

Browse Source
This commit is contained in:
Marius Stanciu
2019-01-31 03:45:21 +02:00
committed by Marius S
parent 31fd80a843
commit 53d50c799f
6 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlatCAMApp.py
View File

@@ -91,7 +91,7 @@ class App(QtCore.QObject):
# Version # Version
version = 8.906 version = 8.906
version_date = "2019/01/30" version_date = "2019/02/1"
beta = True beta = True
# URL for update checks and statistics # URL for update checks and statistics

1
README.md
View File

@@ -21,6 +21,7 @@ CAD program, and create G-Code for Isolation routing.
- more fixes in camlib.CNCJob regarding usage of toolchange (in case it is None) - more fixes in camlib.CNCJob regarding usage of toolchange (in case it is None)
- fixed postprocessor files to work with toolchange_xy parameter value = None (no values in Edit - Preferences fields) - fixed postprocessor files to work with toolchange_xy parameter value = None (no values in Edit - Preferences fields)
- fixed Tcl commands CncJob and DrillCncJob to work with toolchange - fixed Tcl commands CncJob and DrillCncJob to work with toolchange
- added to the postprocessor files the command after toolchange to go with G00 (fastest) to "Z Move" value of Z pozition.
29.01.2019 29.01.2019

2
postprocessors/default.py
View File

@@ -112,6 +112,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
t_drills=no_drills, t_drills=no_drills,
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
else: else:
@@ -137,6 +138,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
tool=int(p.tool), tool=int(p.tool),
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
def up_to_zero_code(self, p): def up_to_zero_code(self, p):

2
postprocessors/grbl_11.py
View File

@@ -111,6 +111,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
t_drills=no_drills, t_drills=no_drills,
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
else: else:
@@ -136,6 +137,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
tool=int(p.tool), tool=int(p.tool),
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
def up_to_zero_code(self, p): def up_to_zero_code(self, p):

4
postprocessors/manual_toolchange.py
View File

@@ -123,6 +123,7 @@ M0
t_drills=no_drills, t_drills=no_drills,
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
else: else:
@@ -143,7 +144,7 @@ M0
tool=int(p.tool), tool=int(p.tool),
toolC=toolC_formatted) toolC=toolC_formatted)
else: else:
gcode = """G00 Z{toolchangez} gcode = """G00 Z{toolchangez}
T{tool} T{tool}
M5 M5
(MSG, Change to Tool Dia = {toolC}) (MSG, Change to Tool Dia = {toolC})
@@ -156,6 +157,7 @@ M0
tool=int(p.tool), tool=int(p.tool),
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
def up_to_zero_code(self, p): def up_to_zero_code(self, p):

2
postprocessors/marlin.py
View File

@@ -112,6 +112,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
t_drills=no_drills, t_drills=no_drills,
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G0 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
else: else:
@@ -137,6 +138,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
tool=int(p.tool), tool=int(p.tool),
toolC=toolC_formatted) toolC=toolC_formatted)
gcode += 'G0 Z%.*f' % (p.coords_decimals, p.zmove)
return gcode return gcode
def up_to_zero_code(self, p): def up_to_zero_code(self, p):