diff --git a/CHANGELOG.md b/CHANGELOG.md index b8645413..3ffb4813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM Evo beta ================================================= +19.10.2023 + +- fixed preprocessors issue where the start GCode was not added due of trying to access an object that did not exist (because its name was not changed to reflect the changes in other parts on the app) + 27.09.2023 - Gerber parser: added support for obsoleted G55 command before a D03 (flash) diff --git a/preprocessors/GRBL_11.py b/preprocessors/GRBL_11.py index fe453c56..c06ec0f5 100644 --- a/preprocessors/GRBL_11.py +++ b/preprocessors/GRBL_11.py @@ -59,7 +59,7 @@ class GRBL_11(PreProc): gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n' gcode += '\n(Tools Offset: )\n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + ')\n' diff --git a/preprocessors/GRBL_11_no_M6.py b/preprocessors/GRBL_11_no_M6.py index 9dc192cd..f91c6983 100644 --- a/preprocessors/GRBL_11_no_M6.py +++ b/preprocessors/GRBL_11_no_M6.py @@ -59,7 +59,7 @@ class GRBL_11_no_M6(PreProc): gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n' gcode += '\n(Tools Offset: )\n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + ')\n' diff --git a/preprocessors/ISEL_CNC.py b/preprocessors/ISEL_CNC.py index f54fd6c2..8121a51c 100644 --- a/preprocessors/ISEL_CNC.py +++ b/preprocessors/ISEL_CNC.py @@ -57,7 +57,7 @@ class ISEL_CNC(PreProc): gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n' gcode += '\n(Tools Offset: )\n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + ')\n' diff --git a/preprocessors/ISEL_ICP_CNC.py b/preprocessors/ISEL_ICP_CNC.py index 42e2f34e..95d96b2c 100644 --- a/preprocessors/ISEL_ICP_CNC.py +++ b/preprocessors/ISEL_ICP_CNC.py @@ -57,7 +57,7 @@ class ISEL_ICP_CNC(PreProc): gcode += ';Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + '\n' gcode += '\n;Tools Offset: \n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += ';Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + '\n' diff --git a/preprocessors/Line_xyz.py b/preprocessors/Line_xyz.py index 1c7d3c5f..ec8aa2bd 100644 --- a/preprocessors/Line_xyz.py +++ b/preprocessors/Line_xyz.py @@ -58,7 +58,7 @@ class Line_xyz(PreProc): gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n' gcode += '\n(Tools Offset: )\n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + ')\n' diff --git a/preprocessors/Marlin.py b/preprocessors/Marlin.py index 427d9903..5a0d5002 100644 --- a/preprocessors/Marlin.py +++ b/preprocessors/Marlin.py @@ -59,7 +59,7 @@ class Marlin(PreProc): gcode += ';Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + '\n' gcode += '\n;Tools Offset: \n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += ';Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + '\n' diff --git a/preprocessors/Repetier.py b/preprocessors/Repetier.py index bc7e55bc..7a7afc8b 100644 --- a/preprocessors/Repetier.py +++ b/preprocessors/Repetier.py @@ -59,7 +59,7 @@ class Repetier(PreProc): gcode += ';Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + '\n' gcode += '\n;Tools Offset: \n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += ';Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + '\n' diff --git a/preprocessors/Toolchange_Probe_MACH3.py b/preprocessors/Toolchange_Probe_MACH3.py index 92184db9..ad036fe5 100644 --- a/preprocessors/Toolchange_Probe_MACH3.py +++ b/preprocessors/Toolchange_Probe_MACH3.py @@ -58,7 +58,7 @@ class Toolchange_Probe_MACH3(PreProc): gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n' gcode += '\n(Tools Offset: )\n' - for tool, val in p['exc_cnc_tools'].items(): + for tool, val in p['tools'].items(): gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \ str(val['data']["tools_drill_offset"]) + ')\n'