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

23
preprocessors/GRBL_laser.py
View File

@@ -43,7 +43,8 @@ class GRBL_laser(PreProc):
gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n'
gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n'
gcode += '(Laser Power - Spindle Speed: ' + str(p['spindlespeed']) + ')\n\n'
gcode += '(Laser Power - Spindle Speed: ' + str(p['spindlespeed']) + ')\n'
gcode += '(Laser Minimum Power: ' + str(p['laser_min_power']) + ')\n\n'
gcode += ('G20' if p.units.upper() == 'IN' else 'G21') + "\n"
gcode += 'G90\n'
@@ -56,19 +57,28 @@ class GRBL_laser(PreProc):
return ''
def lift_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def down_code(self, p):
if p.spindlespeed:
return '%s S%s' % ('M3', str(p.spindlespeed))
else:
return 'M3'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def toolchange_code(self, p):
return ''
def up_to_zero_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def position_code(self, p):
# formula for skewing on x for example is:
@@ -117,4 +127,7 @@ class GRBL_laser(PreProc):
return ''
def spindle_stop_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'

21
preprocessors/GRBL_laser_z.py
View File

@@ -51,6 +51,7 @@ class GRBL_laser_z(PreProc):
gcode += '(Feedrate: ' + str(p['feedrate']) + units + '/min' + ')\n'
gcode += '(Z Focus: ' + str(p['z_move']) + units + ')\n'
gcode += '(Laser Power: %s)\n' % str(p['spindlespeed'])
gcode += '(Laser Minimum Power: %s)\n' % str(p['laser_min_power'])
gcode += '\n'
gcode += '(X-Y End: ' + str(p['xy_end']) + units + ')\n'
@@ -77,19 +78,28 @@ class GRBL_laser_z(PreProc):
return gcode
def lift_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def down_code(self, p):
if p.spindlespeed:
return '%s S%s' % ('M3', str(p.spindlespeed))
else:
return 'M3'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def toolchange_code(self, p):
return 'G0 Z' + self.coordinate_format % (p.coords_decimals, p.z_move)
def up_to_zero_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'
def position_code(self, p):
# formula for skewing on x for example is:
@@ -138,4 +148,7 @@ class GRBL_laser_z(PreProc):
return ''
def spindle_stop_code(self, p):
return 'M5'
if float(p.laser_min_power) > 0.0:
return 'M03 S%s' % str(p.laser_min_power)
else:
return 'M5'

30
preprocessors/Marlin_laser_FAN_pin.py
View File

@@ -51,7 +51,8 @@ class Marlin_laser_FAN_pin(PreProc):
gcode += ';X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + '\n'
gcode += ';Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + '\n\n'
gcode += ';Laser Power (Spindle Speed): ' + str(p['spindlespeed']) + '\n' + '\n'
gcode += ';Laser Power (Spindle Speed): %s\n' % str(p['spindlespeed'])
gcode += ';Laser Minimum Power: %s\n\n' % str(p['laser_min_power'])
gcode += 'G20\n' if p.units.upper() == 'IN' else 'G21\n'
gcode += 'G90'
@@ -62,9 +63,12 @@ class Marlin_laser_FAN_pin(PreProc):
return ''
def lift_code(self, p):
gcode = 'M400\n'
gcode += 'M107'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M106 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M106 S0'
return gcode
def down_code(self, p):
if p.spindlespeed:
@@ -76,9 +80,12 @@ class Marlin_laser_FAN_pin(PreProc):
return ''
def up_to_zero_code(self, p):
gcode = 'M400\n'
gcode += 'M107'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M106 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M106 S0'
return gcode
def position_code(self, p):
# formula for skewing on x for example is:
@@ -132,6 +139,9 @@ class Marlin_laser_FAN_pin(PreProc):
return ''
def spindle_stop_code(self, p):
gcode = 'M400\n'
gcode += 'M106 S0'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M106 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M106 S0'
return gcode

38
preprocessors/Marlin_laser_Spindle_pin.py
View File

@@ -50,7 +50,8 @@ class Marlin_laser_Spindle_pin(PreProc):
gcode += ';X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + '\n'
gcode += ';Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + '\n\n'
gcode += ';Laser Power (Spindle Speed): ' + str(p['spindlespeed']) + '\n' + '\n'
gcode += ';Laser Power (Spindle Speed): %s\n' % str(p['spindlespeed'])
gcode += ';Laser Minimum Power: %s\n\n' % str(p['laser_min_power'])
gcode += 'G20\n' if p.units.upper() == 'IN' else 'G21\n'
gcode += 'G90'
@@ -61,24 +62,32 @@ class Marlin_laser_Spindle_pin(PreProc):
return ''
def lift_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode
def down_code(self, p):
sdir = {'CW': 'M3', 'CCW': 'M4'}[p.spindledir]
if p.spindlespeed:
return '%s S%s' % (sdir, str(p.spindlespeed))
return 'M3 S%s' % str(p.spindlespeed)
else:
return sdir
return 'M3'
def toolchange_code(self, p):
return ''
def up_to_zero_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode
def position_code(self, p):
# formula for skewing on x for example is:
@@ -133,6 +142,9 @@ class Marlin_laser_Spindle_pin(PreProc):
return ''
def spindle_stop_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode

36
preprocessors/Marlin_laser_z.py
View File

@@ -49,11 +49,20 @@ class Marlin_laser_z(PreProc):
for tool, val in p['tools'].items():
gcode += ';Tool: %s -> ' % str(tool) + 'Power: %s' % \
str(val['data']["tools_mill_spindlespeed"]) + '\n'
gcode += '\n;LASER MIN POWER: \n'
for tool, val in p['tools'].items():
if str(p['options']['type']) == 'Excellon':
gcode += ';Tool: %s -> ' % str(tool) + 'Power: %s' % \
str(val['data']["tools_drill_min_power"]) + '\n'
else:
gcode += ';Tool: %s -> ' % str(tool) + 'Power: %s' % \
str(val['data']["tools_mill_min_power"]) + '\n'
else:
gcode += ';Feedrate: %s %s/min\n' % (str(p['feedrate']), units)
gcode += ';Feedrate rapids: %s %s/min\n\n' % (str(p['feedrate_rapid']), units)
gcode += ';Z Focus: %s %s\n' % (str(p['z_move']), units)
gcode += ';Laser Power: %s\n' % str(p['spindlespeed'])
gcode += ';Laser Minimum Power: %s\n\n' % str(p['laser_min_power'])
gcode += '\n'
if coords_xy is not None:
@@ -89,9 +98,12 @@ class Marlin_laser_z(PreProc):
return ''
def lift_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode
def down_code(self, p):
if p.spindlespeed:
@@ -103,9 +115,12 @@ class Marlin_laser_z(PreProc):
return 'G0 Z' + self.coordinate_format % (p.coords_decimals, p.z_move)
def up_to_zero_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode
def position_code(self, p):
# formula for skewing on x for example is:
@@ -160,6 +175,9 @@ class Marlin_laser_z(PreProc):
return ''
def spindle_stop_code(self, p):
gcode = 'M400\n'
gcode += 'M5'
return gcode
if float(p.laser_min_power) > 0.0:
return 'M3 S%s' % str(p.laser_min_power)
else:
gcode = 'M400\n'
gcode += 'M5'
return gcode