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

- added Repetier postprocessor file

Browse Source 
- removed "added ability to regenerate objects (it's actually deletion followed by recreation)" because of the way Python pass parameters to functions by reference instead of copy
This commit is contained in:
Marius Stanciu
2019-02-22 16:54:58 +02:00
committed by Marius
parent 60b08dfec5
commit 7272b46dd9
7 changed files with 367 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FlatCAMObj.py
View File

@@ -5000,20 +5000,21 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
try:
for key in self.cnc_tools:
if self.cnc_tools[key]['data']['ppname_g'] == 'marlin':
ppg = self.cnc_tools[key]['data']['ppname_g']
if ppg == 'marlin' or ppg == 'Repetier':
marlin = True
break
if self.cnc_tools[key]['data']['ppname_g'] == 'hpgl':
if ppg == 'hpgl':
hpgl = True
break
if "toolchange_probe" in self.cnc_tools[key]['data']['ppname_g'].lower():
if "toolchange_probe" in ppg.lower():
probe_pp = True
break
except Exception as e:
log.debug("FlatCAMCNCJob.gcode_header() error: --> %s" % str(e))
try:
if self.options['ppname_e'] == 'marlin':
if self.options['ppname_e'] == 'marlin' or self.options['ppname_e'] == 'Repetier':
marlin = True
except Exception as e:
log.debug("FlatCAMCNCJob.gcode_header(): --> There is no such self.option: %s" % str(e))
@@ -5025,7 +5026,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
log.debug("FlatCAMCNCJob.gcode_header(): --> There is no such self.option: %s" % str(e))
if marlin is True:
gcode = ';Marlin G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \
gcode = ';Marlin(Repetier) G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \
(str(self.app.version), str(self.app.version_date)) + '\n'
gcode += ';Name: ' + str(self.options['name']) + '\n'