- fixed not adding the feedrate code in drillcncjob Tcl command

- fixed crash when trying to do a `select all` and there are app Scripts present
- updated the `drillcncjob` Tcl command to make a script exit in case of an error
This commit is contained in:
Marius Stanciu
2022-01-30 16:25:11 +02:00
committed by Marius
parent 619a9b7fe9
commit 71441a80e5
10 changed files with 86 additions and 62 deletions

View File

@@ -90,7 +90,6 @@ class GRBL_11(PreProc):
else:
gcode += '(X,Y End: ' + "None" + units + ')\n'
gcode += '(Steps per circle: ' + str(p['steps_per_circle']) + ')\n'
gcode += '(Steps per circle: ' + str(p['steps_per_circle']) + ')\n'
if str(p['options']['type']) == 'Excellon' or str(p['options']['type']) == 'Excellon Geometry':
gcode += '(Preprocessor Excellon: ' + str(p['pp_excellon_name']) + ')\n' + '\n'
@@ -258,8 +257,10 @@ G00 Z{z_toolchange}
return sdir
def dwell_code(self, p):
gcode = ''
if p.dwelltime:
return 'G4 P' + str(p.dwelltime)
gcode += 'G4 P' + str(p.dwelltime)
return gcode
def spindle_stop_code(self, p):
return 'M05'