From c91ec6f5110308f76dd4b0da12bb555dd3280cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20Sandvik=20Nilsson?= Date: Fri, 17 Jul 2015 10:16:27 +0200 Subject: [PATCH] Added 'toolchange' as an optional parameter to shell command 'drillcncjob', '-toolchange 1' toggles the option. --- FlatCAMApp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index b138e4c7..6a375039 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2055,7 +2055,8 @@ class App(QtCore.QObject): 'outname': str, 'drillz': float, 'travelz': float, - 'feedrate': float} + 'feedrate': float, + 'toolchange': int} for key in kwa: if key not in types: @@ -2085,7 +2086,8 @@ class App(QtCore.QObject): job_obj.z_cut = kwa["drillz"] job_obj.z_move = kwa["travelz"] job_obj.feedrate = kwa["feedrate"] - job_obj.generate_from_excellon_by_tool(obj, kwa["tools"]) + toolchange = True if "toolchange" in kwa and kwa["toolchange"] == 1 else False + job_obj.generate_from_excellon_by_tool(obj, kwa["tools"], toolchange) job_obj.gcode_parse()