- Drilling and Milling Tools: added support to choose the GCode for turning On the laser

This commit is contained in:
Marius Stanciu
2023-12-06 21:00:07 +02:00
parent 825a05d538
commit 569a30ee52
33 changed files with 329 additions and 241 deletions

View File

@@ -256,8 +256,8 @@ class TclCommandCncjob(TclCommandSignaled):
for tool_uid in list(local_tools_dict.keys()):
if 'data' in local_tools_dict[tool_uid]:
local_tools_dict[tool_uid]['data']['segx'] = self.app.options['geometry_segx']
local_tools_dict[tool_uid]['data']['segy'] = self.app.options['geometry_segx']
local_tools_dict[tool_uid]['data']['seg_x'] = self.app.options['geometry_seg_x']
local_tools_dict[tool_uid]['data']['seg_y'] = self.app.options['geometry_seg_x']
local_tools_dict[tool_uid]['data']['tools_mill_tooldia'] = args["dia"]
local_tools_dict[tool_uid]['data']['tools_mill_cutz'] = args["z_cut"]
local_tools_dict[tool_uid]['data']['tools_mill_travelz'] = args["z_move"]
@@ -285,7 +285,7 @@ class TclCommandCncjob(TclCommandSignaled):
local_tools_dict[tool_uid]['data']['tools_mill_min_power'] = args['las_min_pwr']
local_tools_dict[tool_uid]['data']['tools_mill_ppname_g'] = args["pp"]
self.app.milling_tool.mtool_gen_cncjob(
self.app.milling_tool.generate_cnc_job_handler(
geo_obj=obj,
outname=args['outname'],
tools_dict=local_tools_dict,

View File

@@ -202,8 +202,8 @@ class TclCommandCopperClear(TclCommand):
"tools_ncc_contour": contour,
"tools_ncc_overlap": overlap,
"segx": self.app.options["geometry_segx"],
"segy": self.app.options["geometry_segy"]
"seg_x": self.app.options["geometry_seg_x"],
"seg_y": self.app.options["geometry_seg_y"]
})
ncc_tools = {}

View File

@@ -190,8 +190,8 @@ class TclCommandPaint(TclCommand):
"tools_paint_connect": connect,
"tools_paint_contour": contour,
"tools_paint_overlap": overlap,
"segx": self.app.options["geometry_segx"],
"segy": self.app.options["geometry_segy"]
"seg_x": self.app.options["geometry_seg_x"],
"seg_y": self.app.options["geometry_seg_y"]
})
# create a `tools` dict