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

- completed the refactoring of object options property to obj_options in preprocessors too

Browse Source
This commit is contained in:
Marius Stanciu
2022-02-18 13:21:20 +02:00
committed by Marius Stanciu
parent 1681b327ed
commit f7f88a34be
23 changed files with 177 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
preprocessors/Marlin_laser_z.py
View File

@@ -24,10 +24,10 @@ class Marlin_laser_z(PreProc):
gcode += ';It is for the case when it is used together with a LASER connected on the SPINDLE connector.\n' \
';On toolchange event the laser will move to a defined Z height to change the laser dot size.\n\n'
xmin = '%.*f' % (p.coords_decimals, p['options']['xmin'])
xmax = '%.*f' % (p.coords_decimals, p['options']['xmax'])
ymin = '%.*f' % (p.coords_decimals, p['options']['ymin'])
ymax = '%.*f' % (p.coords_decimals, p['options']['ymax'])
xmin = '%.*f' % (p.coords_decimals, p['obj_options']['xmin'])
xmax = '%.*f' % (p.coords_decimals, p['obj_options']['xmax'])
ymin = '%.*f' % (p.coords_decimals, p['obj_options']['ymin'])
ymax = '%.*f' % (p.coords_decimals, p['obj_options']['ymax'])
if p['use_ui'] is True and p['multigeo']:
gcode += '\n;TOOLS DIAMETER: \n'
@@ -51,7 +51,7 @@ class Marlin_laser_z(PreProc):
str(val['data']["tools_mill_spindlespeed"]) + '\n'
gcode += '\n;LASER MIN POWER: \n'
for tool, val in p['tools'].items():
if str(p['options']['type']) == 'Excellon':
if str(p['obj_options']['type']) == 'Excellon':
gcode += ';Tool: %s -> ' % str(tool) + 'Power: %s' % \
str(val['data']["tools_drill_min_power"]) + '\n'
else:
@@ -78,7 +78,7 @@ class Marlin_laser_z(PreProc):
gcode += ';Z End: ' + str(p['z_end']) + units + '\n'
gcode += ';Steps per circle: ' + str(p['steps_per_circle']) + '\n'
if str(p['options']['type']) == 'Excellon' or str(p['options']['type']) == 'Excellon Geometry':
if str(p['obj_options']['type']) == 'Excellon' or str(p['obj_options']['type']) == 'Excellon Geometry':
gcode += ';Preprocessor Excellon: ' + str(p['pp_excellon_name']) + '\n'
else:
gcode += ';Preprocessor Geometry: ' + str(p['pp_geometry_name']) + '\n'