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

Added parameter "spindlespeed" to cncjob and drillcncjob. Will generate gcode "M03 S4000" (4000 rpm), or "M03" if omitted.

Browse Source
This commit is contained in:
Jørn Sandvik Nilsson
2015-07-17 09:49:24 +02:00
parent 7a7e160de5
commit 44f5da3326
5 changed files with 85 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
FlatCAMApp.py
View File

@@ -266,7 +266,8 @@ class App(QtCore.QObject):
"zdownrate": None,
"excellon_zeros": "L",
"gerber_use_buffer_for_union": True,
"cncjob_coordinate_format": "X%.4fY%.4f"
"cncjob_coordinate_format": "X%.4fY%.4f",
"spindlespeed": None
})
###############################
@@ -1809,7 +1810,8 @@ class App(QtCore.QObject):
"zdownrate": CNCjob,
"excellon_zeros": Excellon,
"gerber_use_buffer_for_union": Gerber,
"cncjob_coordinate_format": CNCjob
"cncjob_coordinate_format": CNCjob,
"spindlespeed": CNCjob
}
for param in routes:
@@ -2055,7 +2057,9 @@ class App(QtCore.QObject):
'outname': str,
'drillz': float,
'travelz': float,
'feedrate': float}
'feedrate': float,
'spindlespeed': int
}
for key in kwa:
if key not in types:
@@ -2085,7 +2089,8 @@ class App(QtCore.QObject):
job_obj.z_cut = kwa["drillz"]
job_obj.z_move = kwa["travelz"]
job_obj.feedrate = kwa["feedrate"]
job_obj.generate_from_excellon_by_tool(obj, kwa["tools"])
job_obj.spindlespeed = kwa["spindlespeed"] if "spindlespeed" in kwa else None
job_obj.generate_from_excellon_by_tool(obj, kwa["tools"], True)
job_obj.gcode_parse()
@@ -2133,7 +2138,9 @@ class App(QtCore.QObject):
'z_move': float,
'feedrate': float,
'tooldia': float,
'outname': str}
'outname': str,
'spindlespeed': int
}
for key in kwa:
if key not in types: