- fixed errors in the Roland preprocessors

- fixed CNCJob plot scaling when using Roland preprocessors
- in Roland preprocessors added the use of spindlespeed
- made sure that the preprocessors that don't use the gcode_header still use the start gcode
This commit is contained in:
Marius Stanciu
2021-07-23 23:39:25 +03:00
committed by Marius
parent db2c70a0a2
commit 4d60e5c197
5 changed files with 47 additions and 26 deletions

View File

@@ -74,9 +74,9 @@ class Roland_MDX_20(PreProc):
def linear_code(self, p):
if p.units.upper() == 'IN':
z = p.z / 25.4
z = p.z_cut / 25.4
else:
z = p.z
z = p.z_cut
gcode = self.feedrate_code(p) + '\n'
gcode += self.position_code(p).format(**p) + ',' + str(float(z * 40.0)) + ';'
return gcode
@@ -121,10 +121,18 @@ class Roland_MDX_20(PreProc):
return 'V' + str(self.feedrate_format % fr_sec) + ';'
def spindle_code(self, p):
return '!MC1'
speed = int(p.spindlespeed)
if speed > 8388607:
speed = 8388607
if speed < 0:
speed = 0
gcode = '!MC1;\n'
gcode += '!RC%d;' % speed
return gcode
def dwell_code(self, p):
return''
return ''
def spindle_stop_code(self, p):
return '!MC0'
return '!MC0;'