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

- finished implementing the new feature that add a new parameter laser minimum power for the Drillin, Milling Plugins and for the cncjob and drillcncjob Tcl commands:

Browse Source 
- modified all the preprocessors that are for `laser` to use the new parameter: `laser minimum power`
This commit is contained in:
Marius Stanciu
2022-01-30 21:33:06 +02:00
committed by Marius
parent dbc2e5c381
commit d6c345656c
12 changed files with 150 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appPlugins/ToolDrilling.py
View File

@@ -351,6 +351,8 @@ class ToolDrilling(AppTool, Excellon):
"tools_drill_feedrate_rapid": self.ui.feedrate_rapid_entry,
"tools_drill_spindlespeed": self.ui.spindlespeed_entry,
"tools_drill_min_power": self.ui.las_min_pwr_entry,
"tools_drill_dwell": self.ui.dwell_cb,
"tools_drill_dwelltime": self.ui.dwelltime_entry,
@@ -390,6 +392,7 @@ class ToolDrilling(AppTool, Excellon):
"e_fr_rapid": "tools_drill_feedrate_rapid",
"e_spindlespeed": "tools_drill_spindlespeed",
"e_minpower": "tools_drill_min_power",
"e_dwell": "tools_drill_dwell",
"e_dwelltime": "tools_drill_dwelltime",

4
appPlugins/ToolMilling.py
View File

@@ -523,6 +523,7 @@ class ToolMilling(AppTool, Excellon):
"tools_mill_spindlespeed": self.ui.spindlespeed_entry,
"tools_mill_dwell": self.ui.dwell_cb,
"tools_mill_dwelltime": self.ui.dwelltime_entry,
"tools_mill_min_power": self.ui.las_min_pwr_entry,
}
self.general_form_fields = {
@@ -580,6 +581,7 @@ class ToolMilling(AppTool, Excellon):
"mill_spindlespeed": "tools_mill_spindlespeed",
"mill_dwell": "tools_mill_dwell",
"mill_dwelltime": "tools_mill_dwelltime",
"mill_minpower":"tools_mill_min_power",
# General Parameters
"mill_toolchange": "tools_mill_toolchange",
@@ -3123,6 +3125,7 @@ class ToolMilling(AppTool, Excellon):
spindlespeed = tools_dict[tooluid_key]['data']["tools_mill_spindlespeed"]
dwell = tools_dict[tooluid_key]['data']["tools_mill_dwell"]
dwelltime = tools_dict[tooluid_key]['data']["tools_mill_dwelltime"]
laser_min_power = tools_dict[tooluid_key]['data']["tools_mill_min_power"]
pp_geometry_name = tools_dict[tooluid_key]['data']["tools_mill_ppname_g"]
spindledir = self.app.defaults['tools_mill_spindledir']
@@ -3149,6 +3152,7 @@ class ToolMilling(AppTool, Excellon):
z_cut=z_cut, z_move=z_move,
feedrate=feedrate, feedrate_z=feedrate_z, feedrate_rapid=feedrate_rapid,
spindlespeed=spindlespeed, spindledir=spindledir, dwell=dwell, dwelltime=dwelltime,
laser_min_power=laser_min_power,
multidepth=multidepth, depthpercut=depthpercut,
extracut=extracut, extracut_length=extracut_length, startz=startz, endz=endz, endxy=endxy,
toolchange=toolchange, toolchangez=toolchangez, toolchangexy=toolchangexy,