kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'master' into patch-5

Browse Source
This commit is contained in:
sliptonic
2023-10-02 12:16:55 -05:00
committed by GitHub
parent d9090d45da d8a30d58ab
commit 047334fd50
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Path/Path/Post/scripts/centroid_post.py
View File

@@ -51,7 +51,6 @@ Arguments for centroid:
--feed-precision=1 ... number of digits of precision for feed rate. Default=1
--axis-precision=4 ... number of digits of precision for axis moves. Default=4
--inches ... Convert output for US imperial mode (G20)
--no-tlo ... Suppress tool length offset (G43) following tool changes
"""
# These globals set common customization preferences
@@ -63,7 +62,6 @@ if FreeCAD.GuiUp:
else:
SHOW_EDITOR = False
MODAL = False # if true commands are suppressed if the same as previous line.
USE_TLO = True # if true G43 will be output following tool changes
COMMAND_SPACE = " "
LINENR = 100 # line number starting value
@@ -141,7 +139,6 @@ def processArguments(argstring):
global UNIT_SPEED_FORMAT
global UNIT_FORMAT
global UNITS
global USE_TLO
for arg in argstring.split():
if arg == "--header":
@@ -168,8 +165,6 @@ def processArguments(argstring):
UNITS = "G20"
UNIT_SPEED_FORMAT = "in/min"
UNIT_FORMAT = "in"
elif arg == "--no-tlo":
USE_TLO = False
def export(objectslist, filename, argstring):
@@ -347,8 +342,6 @@ def parse(pathobj):
# out += linenumber() + "(begin toolchange)\n"
for line in TOOL_CHANGE.splitlines(True):
out += linenumber() + line
if USE_TLO:
out += linenumber() + "G43 H" + str(int(c.Parameters["T"])) + "\n"
# if command == "message":
# if OUTPUT_COMMENTS is False:

9
src/Mod/Path/PathTests/TestCentroidPost.py
View File

@@ -277,15 +277,16 @@ M99
args = "--no-header --no-show-editor"
gcode = postprocessor.export(postables, "gcode.tmp", args)
self.assertEqual(gcode.splitlines()[5], "G43 H2")
self.assertEqual(gcode.splitlines()[6], "M6 T2")
self.assertEqual(gcode.splitlines()[7], "M3 S3000")
self.assertEqual(gcode.splitlines()[5], "M6 T2")
self.assertEqual(gcode.splitlines()[6], "M3 S3000")
# suppress TLO
#
# The original centroid postprocessor does not have an
# --no-tlo option. We end up with the original gcode.
#
args = "--no-header --no-tlo --no-show-editor"
gcode = postprocessor.export(postables, "gcode.tmp", args)
self.assertEqual(gcode.splitlines()[5], "G43 H2")
self.assertEqual(gcode.splitlines()[6], "M3 S3000")
def test090(self):