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

- updated the header of the postprocessos with 'laser' to show essential informations like some of them do not move on the Z axis

Browse Source 
- make sure that the laser postprocessor that do move on the Z axis (like 'GRBL_laser_Z') accept negative values for the Z focus
- fixed issue in highlighter such that the keywords that have an underscore included are highlighted
- rearranged the default keywords
- fixed the generatecncjob() method default parameters to reflect new data structure names
- in Geometry object the default self.options dictionary is updated with keys that reflect new data structure
This commit is contained in:
Marius Stanciu
2022-01-19 02:25:40 +02:00
committed by Marius
parent 04e6bf0872
commit cdf6872e5e
10 changed files with 138 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tclCommands/TclCommandCncjob.py
View File

@@ -134,10 +134,16 @@ class TclCommandCncjob(TclCommandSignaled):
args["z_move"] = args["z_move"] if "z_move" in args and args["z_move"] else \
self.app.defaults["geometry_travelz"]
args["pp"] = args["pp"] if "pp" in args and args["pp"] else self.app.defaults["tools_mill_ppname_g"]
args["feedrate"] = args["feedrate"] if "feedrate" in args and args["feedrate"] else \
self.app.defaults["tools_mill_feedrate"]
args["feedrate_z"] = args["feedrate_z"] if "feedrate_z" in args and args["feedrate_z"] else \
self.app.defaults["tools_mill_feedrate_z"]
if 'laser' in args["pp"] and "feedrate_z" not in args:
args["feedrate_z"] = args["feedrate"]
else:
args["feedrate_z"] = args["feedrate_z"] if "feedrate_z" in args and args["feedrate_z"] else \
self.app.defaults["tools_mill_feedrate_z"]
args["feedrate_rapid"] = args["feedrate_rapid"] if "feedrate_rapid" in args and args["feedrate_rapid"] else \
self.app.defaults["tools_mill_feedrate_rapid"]
@@ -188,8 +194,6 @@ class TclCommandCncjob(TclCommandSignaled):
args["dwell"] = self.app.defaults["tools_mill_dwell"]
args["dwelltime"] = self.app.defaults["tools_mill_dwelltime"]
args["pp"] = args["pp"] if "pp" in args and args["pp"] else self.app.defaults["tools_mill_ppname_g"]
if "toolchangez" in args:
args["toolchange"] = True
if args["toolchangez"] is not None: