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

Spindle speed for G-code from geometry and excellon. Solves #124.

Browse Source
This commit is contained in:
Juan Pablo Caram
2015-09-05 17:41:00 -04:00
parent 40e8445f2d
commit f503dabc7e
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FlatCAMApp.py
View File

@@ -195,12 +195,14 @@ class App(QtCore.QObject):
"excellon_drillz": self.defaults_form.excellon_group.cutz_entry,
"excellon_travelz": self.defaults_form.excellon_group.travelz_entry,
"excellon_feedrate": self.defaults_form.excellon_group.feedrate_entry,
"excellon_spindlespeed": self.defaults_form.excellon_group.spindlespeed_entry,
"geometry_plot": self.defaults_form.geometry_group.plot_cb,
"geometry_cutz": self.defaults_form.geometry_group.cutz_entry,
"geometry_travelz": self.defaults_form.geometry_group.travelz_entry,
"geometry_feedrate": self.defaults_form.geometry_group.cncfeedrate_entry,
"geometry_cnctooldia": self.defaults_form.geometry_group.cnctooldia_entry,
"geometry_painttooldia": self.defaults_form.geometry_group.painttooldia_entry,
"geometry_spindlespeed": self.defaults_form.geometry_group.cncspindlespeed_entry,
"geometry_paintoverlap": self.defaults_form.geometry_group.paintoverlap_entry,
"geometry_paintmargin": self.defaults_form.geometry_group.paintmargin_entry,
"cncjob_plot": self.defaults_form.cncjob_group.plot_cb,
@@ -234,11 +236,13 @@ class App(QtCore.QObject):
"excellon_drillz": -0.1,
"excellon_travelz": 0.1,
"excellon_feedrate": 3.0,
"excellon_spindlespeed": None,
"geometry_plot": True,
"geometry_cutz": -0.002,
"geometry_travelz": 0.1,
"geometry_feedrate": 3.0,
"geometry_cnctooldia": 0.016,
"geometry_spindlespeed": None,
"geometry_painttooldia": 0.07,
"geometry_paintoverlap": 0.15,
"geometry_paintmargin": 0.0,
@@ -268,8 +272,7 @@ class App(QtCore.QObject):
"zdownrate": None,
"excellon_zeros": "L",
"gerber_use_buffer_for_union": True,
"cncjob_coordinate_format": "X%.4fY%.4f",
"spindlespeed": None
"cncjob_coordinate_format": "X%.4fY%.4f"
})
###############################
@@ -315,10 +318,12 @@ class App(QtCore.QObject):
"excellon_drillz": self.options_form.excellon_group.cutz_entry,
"excellon_travelz": self.options_form.excellon_group.travelz_entry,
"excellon_feedrate": self.options_form.excellon_group.feedrate_entry,
"excellon_spindlespeed": self.options_form.excellon_group.spindlespeed_entry,
"geometry_plot": self.options_form.geometry_group.plot_cb,
"geometry_cutz": self.options_form.geometry_group.cutz_entry,
"geometry_travelz": self.options_form.geometry_group.travelz_entry,
"geometry_feedrate": self.options_form.geometry_group.cncfeedrate_entry,
"geometry_spindlespeed": self.options_form.geometry_group.cncspindlespeed_entry,
"geometry_cnctooldia": self.options_form.geometry_group.cnctooldia_entry,
"geometry_painttooldia": self.options_form.geometry_group.painttooldia_entry,
"geometry_paintoverlap": self.options_form.geometry_group.paintoverlap_entry,
@@ -353,10 +358,12 @@ class App(QtCore.QObject):
"excellon_drillz": -0.1,
"excellon_travelz": 0.1,
"excellon_feedrate": 3.0,
"excellon_spindlespeed": None,
"geometry_plot": True,
"geometry_cutz": -0.002,
"geometry_travelz": 0.1,
"geometry_feedrate": 3.0,
"geometry_spindlespeed": None,
"geometry_cnctooldia": 0.016,
"geometry_painttooldia": 0.07,
"geometry_paintoverlap": 0.15,