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

- fixed issue #341 that affected both postprocessors that have inlined feedrate: marlin and repetier. THe used feedrate was the Feedrate X-Y and instead had to be Feedrate Z.

Browse Source
This commit is contained in:
Marius Stanciu
2019-11-16 22:48:51 +02:00
committed by Marius
parent f20d5aaaca
commit 021e094b73
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
16.11.2019
- fixed issue #341 that affected both postprocessors that have inlined feedrate: marlin and repetier. THe used feedrate was the Feedrate X-Y and instead had to be Feedrate Z.
15.11.2019 15.11.2019
- added all the recognized extensions to the save dialog filters; latest extension used will be preselected next time a save operation occur - added all the recognized extensions to the save dialog filters; latest extension used will be preselected next time a save operation occur

2
flatcamTools/ToolCopperThieving.py
View File

@@ -817,7 +817,7 @@ class ToolCopperThieving(FlatCAMTool):
bounding_box = cascaded_union(geo_buff_list) bounding_box = cascaded_union(geo_buff_list)
elif isinstance(working_obj, FlatCAMGerber): elif isinstance(working_obj, FlatCAMGerber):
geo_n = cascaded_union(geo_n).convex_hull geo_n = cascaded_union(geo_n).convex_hull
bounding_box = cascaded_union(self.ncc_obj.solid_geometry).convex_hull.intersection(geo_n) bounding_box = cascaded_union(thieving_obj.solid_geometry).convex_hull.intersection(geo_n)
bounding_box = bounding_box.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre) bounding_box = bounding_box.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre)
else: else:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported.")) self.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported."))

9
postprocessors/Repetier.py
View File

@@ -78,7 +78,7 @@ class Repetier(FlatCAMPostProc):
return 'G0 Z' + self.coordinate_format%(p.coords_decimals, p.z_move) + " " + self.feedrate_rapid_code(p) return 'G0 Z' + self.coordinate_format%(p.coords_decimals, p.z_move) + " " + self.feedrate_rapid_code(p)
def down_code(self, p): def down_code(self, p):
return 'G1 Z' + self.coordinate_format%(p.coords_decimals, p.z_cut) + " " + self.end_feedrate_code(p) return 'G1 Z' + self.coordinate_format%(p.coords_decimals, p.z_cut) + " " + self.inline_z_feedrate_code(p)
def toolchange_code(self, p): def toolchange_code(self, p):
z_toolchange = p.z_toolchange z_toolchange = p.z_toolchange
@@ -169,7 +169,7 @@ M84
return ('G0 ' + self.position_code(p)).format(**p) + " " + self.feedrate_rapid_code(p) return ('G0 ' + self.position_code(p)).format(**p) + " " + self.feedrate_rapid_code(p)
def linear_code(self, p): def linear_code(self, p):
return ('G1 ' + self.position_code(p)).format(**p) + " " + self.end_feedrate_code(p) return ('G1 ' + self.position_code(p)).format(**p) + " " + self.inline_feedrate_code(p)
def end_code(self, p): def end_code(self, p):
coords_xy = p['xy_toolchange'] coords_xy = p['xy_toolchange']
@@ -183,9 +183,12 @@ M84
def feedrate_code(self, p): def feedrate_code(self, p):
return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate)) return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate))
def end_feedrate_code(self, p): def inline_feedrate_code(self, p):
return 'F' + self.feedrate_format %(p.fr_decimals, p.feedrate) return 'F' + self.feedrate_format %(p.fr_decimals, p.feedrate)
def inline_z_feedrate_code(self, p):
return 'F' + self.feedrate_format %(p.fr_decimals, p.z_feedrate)
def z_feedrate_code(self, p): def z_feedrate_code(self, p):
return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.z_feedrate)) return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.z_feedrate))

13
postprocessors/marlin.py
View File

@@ -1,10 +1,10 @@
# ########################################################## ## # ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing # # FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org # # http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) # # File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 # # Date: 3/10/2019 #
# MIT Licence # # MIT Licence #
# ########################################################## ## # ##########################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *
@@ -78,7 +78,7 @@ class marlin(FlatCAMPostProc):
return 'G0 Z' + self.coordinate_format%(p.coords_decimals, p.z_move) + " " + self.feedrate_rapid_code(p) return 'G0 Z' + self.coordinate_format%(p.coords_decimals, p.z_move) + " " + self.feedrate_rapid_code(p)
def down_code(self, p): def down_code(self, p):
return 'G1 Z' + self.coordinate_format%(p.coords_decimals, p.z_cut) + " " + self.end_feedrate_code(p) return 'G1 Z' + self.coordinate_format%(p.coords_decimals, p.z_cut) + " " + self.inline_z_feedrate_code(p)
def toolchange_code(self, p): def toolchange_code(self, p):
z_toolchange = p.z_toolchange z_toolchange = p.z_toolchange
@@ -175,7 +175,7 @@ M0""".format(z_toolchange=self.coordinate_format%(p.coords_decimals, z_toolchang
return ('G0 ' + self.position_code(p)).format(**p) + " " + self.feedrate_rapid_code(p) return ('G0 ' + self.position_code(p)).format(**p) + " " + self.feedrate_rapid_code(p)
def linear_code(self, p): def linear_code(self, p):
return ('G1 ' + self.position_code(p)).format(**p) + " " + self.end_feedrate_code(p) return ('G1 ' + self.position_code(p)).format(**p) + " " + self.inline_feedrate_code(p)
def end_code(self, p): def end_code(self, p):
coords_xy = p['xy_toolchange'] coords_xy = p['xy_toolchange']
@@ -189,9 +189,12 @@ M0""".format(z_toolchange=self.coordinate_format%(p.coords_decimals, z_toolchang
def feedrate_code(self, p): def feedrate_code(self, p):
return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate)) return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate))
def end_feedrate_code(self, p): def inline_feedrate_code(self, p):
return 'F' + self.feedrate_format %(p.fr_decimals, p.feedrate) return 'F' + self.feedrate_format %(p.fr_decimals, p.feedrate)
def inline_z_feedrate_code(self, p):
return 'F' + self.feedrate_format %(p.fr_decimals, p.z_feedrate)
def z_feedrate_code(self, p): def z_feedrate_code(self, p):
return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.z_feedrate)) return 'G1 F' + str(self.feedrate_format %(p.fr_decimals, p.z_feedrate))