From a623f20cf547bbe7bf38415f6c9088bbac63a385 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 5 May 2022 18:30:16 +0300 Subject: [PATCH] - updated the GCode header --- CHANGELOG.md | 1 + appObjects/CNCJobObject.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc87c0f5..09bc36ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ CHANGELOG for FlatCAM Evo beta - made sure that the draw color in Editors is inverted for the dark mode - added a hack so the dark stylesheet for QWidget is reapplied if that Qwidget is removed (I don't know why it is lost in the first time) - when exiting an Editor with a sub-tool active the cursor data display feature is removed +- updated the GCode header 4.05.2020 diff --git a/appObjects/CNCJobObject.py b/appObjects/CNCJobObject.py index e795c3ef..e3af96cc 100644 --- a/appObjects/CNCJobObject.py +++ b/appObjects/CNCJobObject.py @@ -912,7 +912,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): pass if marlin is True: - gcode += ';Marlin(Repetier) G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \ + gcode += ';Marlin(Repetier) G-code generated by FlatCAM Evo v%s - Version Date: %s\n' % \ (str(self.app.version), str(self.app.version_date)) + '\n' gcode += ';Name: ' + str(self.obj_options['name']) + '\n' @@ -921,7 +921,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): gcode += ';Units: ' + self.units.upper() + '\n' + "\n" gcode += ';Created on ' + time_str + '\n' + '\n' elif hpgl is True: - gcode += 'CO "HPGL CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s' % \ + gcode += 'CO "HPGL code generated by FlatCAM Evo v%s - Version Date: %s' % \ (str(self.app.version), str(self.app.version_date)) + '";\n' gcode += 'CO "Name: ' + str(self.obj_options['name']) + '";\n' @@ -930,7 +930,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): gcode += 'CO "Units: ' + self.units.upper() + '";\n' gcode += 'CO "Created on ' + time_str + '";\n' elif probe_pp is True: - gcode += '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \ + gcode += '(G-code generated by FlatCAM Evo v%s - Version Date: %s)\n' % \ (str(self.app.version), str(self.app.version_date)) + '\n' gcode += '(This GCode tool change is done by using a Probe.)\n' \ @@ -945,7 +945,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): gcode += '(Units: ' + self.units.upper() + ')\n' + "\n" gcode += '(Created on ' + time_str + ')\n' + '\n' elif nccad_pp is True: - gcode += ';NCCAD9 G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s\n' % \ + gcode += ';NCCAD9 G-code generated by FlatCAM Evo v%s - Version Date: %s\n' % \ (str(self.app.version), str(self.app.version_date)) + '\n' gcode += ';Name: ' + str(self.obj_options['name']) + '\n' @@ -954,7 +954,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): gcode += ';Units: ' + self.units.upper() + '\n' + "\n" gcode += ';Created on ' + time_str + '\n' + '\n' else: - gcode += '%sG-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s%s\n' % \ + gcode += '%sG-code generated by FlatCAM Evo v%s - Version Date: %s%s\n' % \ (start_comment, str(self.app.version), str(self.app.version_date), stop_comment) + '\n' gcode += '%sName: ' % start_comment + str(self.obj_options['name']) + '%s\n' % stop_comment