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

- if Start Z parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for laser preprocessors) - for Drilling Plugin too

Browse Source
This commit is contained in:
Marius
2022-02-15 22:38:37 +02:00
parent ac81f4f9f4
commit 363b34641a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
- in Tcl command `add_polygon` added ability to use `-p_coords` optional parameter where the value of this argument should be a list of tuple coordinates - in Tcl command `add_polygon` added ability to use `-p_coords` optional parameter where the value of this argument should be a list of tuple coordinates
- minor fixes in the Milling Plugin - minor fixes in the Milling Plugin
- if `Start Z` parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for `laser` preprocessors) - if `Start Z` parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for `laser` preprocessors)
- if `Start Z` parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for `laser` preprocessors) - for Drilling Plugin too
13.02.2022 13.02.2022

4
camlib.py
View File

@@ -3456,7 +3456,9 @@ class CNCjob(Geometry):
t_gcode += self.doformat(p.toolchange_code, toolchangexy=(temp_locx, temp_locy)) t_gcode += self.doformat(p.toolchange_code, toolchangexy=(temp_locx, temp_locy))
t_gcode += self.doformat(p.z_feedrate_code) t_gcode += self.doformat(p.z_feedrate_code)
else: else:
if self.startz is None or 'laser' in self.pp_excellon_name.lower():
t_gcode += self.doformat(p.lift_code) t_gcode += self.doformat(p.lift_code)
t_gcode += self.doformat(p.startz_code)
# Spindle start # Spindle start
t_gcode += self.doformat(p.spindle_code) t_gcode += self.doformat(p.spindle_code)
@@ -3937,7 +3939,7 @@ class CNCjob(Geometry):
t_gcode += self.doformat(p.toolchange_code) t_gcode += self.doformat(p.toolchange_code)
else: else:
if self.startz is None or 'laser' in self.pp_geometry_name.lower(): if self.startz is None or 'laser' in self.pp_geometry_name.lower():
t_gcode += self.doformat(p.lift_code, x=0, y=0) # Move (up) to travel height t_gcode += self.doformat(p.lift_code, x=0, y=0)
t_gcode += self.doformat(p.startz_code, x=0, y=0) t_gcode += self.doformat(p.startz_code, x=0, y=0)
# Spindle start # Spindle start