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

Allow user to suppress the initial tool change.

Browse Source
This commit is contained in:
Markus Lampert
2018-08-21 22:18:53 -07:00
committed by Yorik van Havre
parent c17bcb1303
commit 6429707f70
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mod/Path/PathScripts/post/grbl_post.py
View File

@@ -34,6 +34,7 @@ import PathScripts.PostUtils as PostUtils
import argparse
import datetime
import shlex
import traceback
now = datetime.datetime.now()
@@ -50,8 +51,7 @@ parser.add_argument('--no-show-editor', action='store_true', help='don\'t pop up
parser.add_argument('--precision', default='4', help='number of digits of precision, default=4')
parser.add_argument('--preamble', help='set commands to be issued before the first command, default="G17\nG90"')
parser.add_argument('--postamble', help='set commands to be issued after the last command, default="M05\nG17 G90\n; M2"')
parser.add_argument('--tool-change', action='store_true', help='insert M6 for tool changes')
parser.add_argument('--no-tool-change', action='store_true', help='suppress all tool chanage commands (default)')
parser.add_argument('--tool-change', help='0 ... suppress all tool change commands\n1 ... insert M6 for all tool changes\n2 ... insert M6 for all tool changes except the initial tool')
TOOLTIP_ARGS=parser.format_help()
@@ -95,6 +95,7 @@ POST_OPERATION = ''''''
#Tool Change commands will be inserted before a tool change
TOOL_CHANGE = ''''''
SUPPRESS_TOOL_CHANGE=0
# to distinguish python built-in open function from the one declared below
@@ -111,6 +112,7 @@ def processArguments(argstring):
global PRECISION
global PREAMBLE
global POSTAMBLE
global SUPPRESS_TOOL_CHANGE
try:
args = parser.parse_args(shlex.split(argstring))
@@ -132,15 +134,15 @@ def processArguments(argstring):
SHOW_EDITOR = True
print("Show editor = %d" % SHOW_EDITOR)
PRECISION = args.precision
if args.preamble is not None:
if not args.preamble is None:
PREAMBLE = args.preamble
if args.postamble is not None:
if not args.postamble is None:
POSTAMBLE = args.postamble
if args.tool_change:
OUTPUT_TOOL_CHANGE = True
if args.no_tool_change:
OUTPUT_TOOL_CHANGE = False
except:
if not args.tool_change is None:
OUTPUT_TOOL_CHANGE = int(args.tool_change) > 0
SUPPRESS_TOOL_CHANGE = min(1, int(args.tool_change) - 1)
except Exception as e:
traceback.print_exc(e)
return False
return True
@@ -237,6 +239,7 @@ def parse(pathobj):
out = ""
lastcommand = None
precision_string = '.' + str(PRECISION) +'f'
global SUPPRESS_TOOL_CHANGE
#params = ['X','Y','Z','A','B','I','J','K','F','S'] #This list control the order of parameters
params = ['X','Y','Z','A','B','I','J','F','S','T','Q','R','L'] #linuxcnc doesn't want K properties on XY plane Arcs need work.
@@ -281,8 +284,9 @@ def parse(pathobj):
if command == 'M6':
if OUTPUT_COMMENTS:
out += linenumber() + "(begin toolchange)\n"
if not OUTPUT_TOOL_CHANGE:
if not OUTPUT_TOOL_CHANGE or SUPPRESS_TOOL_CHANGE > 0:
outstring.insert(0, ";")
SUPPRESS_TOOL_CHANGE = SUPPRESS_TOOL_CHANGE - 1
else:
for line in TOOL_CHANGE.splitlines(True):
out += linenumber() + line