From 5a0488c19f089d08e6a6428126ba7e08c9263e70 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 29 Jan 2019 23:27:42 +0200 Subject: [PATCH] - added a space before Y coordinate in end_code() function in some of the postprocessor files --- README.md | 4 ++++ postprocessors/default.py | 2 +- postprocessors/grbl_11.py | 2 +- postprocessors/manual_toolchange.py | 2 +- postprocessors/marlin.py | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 97d31cdc..df86cb27 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +30.01.2019 + +- added a space before Y coordinate in end_code() function in some of the postprocessor files + 29.01.2019 - fixed issue in Tool Calculators when a float value was entered starting only with the dot. diff --git a/postprocessors/default.py b/postprocessors/default.py index 980eb3a2..7beae193 100644 --- a/postprocessors/default.py +++ b/postprocessors/default.py @@ -114,7 +114,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez) def end_code(self, p): coords_xy = p['toolchange_xy'] gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + "\n") - gcode += 'G00 X{x}Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" + gcode += 'G00 X{x} Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" return gcode def feedrate_code(self, p): diff --git a/postprocessors/grbl_11.py b/postprocessors/grbl_11.py index 7d2160e6..3b98d044 100644 --- a/postprocessors/grbl_11.py +++ b/postprocessors/grbl_11.py @@ -111,7 +111,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez) def end_code(self, p): coords_xy = p['toolchange_xy'] gcode = ('G00 Z' + self.feedrate_format % (p.fr_decimals, p.endz) + "\n") - gcode += 'G00 X{x}Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" + gcode += 'G00 X{x} Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" return gcode def feedrate_code(self, p): diff --git a/postprocessors/manual_toolchange.py b/postprocessors/manual_toolchange.py index 99b2db7c..64e65e77 100644 --- a/postprocessors/manual_toolchange.py +++ b/postprocessors/manual_toolchange.py @@ -128,7 +128,7 @@ M0 def end_code(self, p): coords_xy = p['toolchange_xy'] gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + "\n") - gcode += 'G00 X{x}Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" + gcode += 'G00 X{x} Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + "\n" return gcode def feedrate_code(self, p): diff --git a/postprocessors/marlin.py b/postprocessors/marlin.py index cbf8be1e..57cb5be9 100644 --- a/postprocessors/marlin.py +++ b/postprocessors/marlin.py @@ -104,7 +104,7 @@ M0 Change to Tool Dia = {toolC} def end_code(self, p): coords_xy = p['toolchange_xy'] gcode = ('G0 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + " " + self.feedrate_rapid_code(p) + "\n") - gcode += 'G0 X{x}Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + " " + self.feedrate_rapid_code(p) + "\n" + gcode += 'G0 X{x} Y{y}'.format(x=coords_xy[0], y=coords_xy[1]) + " " + self.feedrate_rapid_code(p) + "\n" return gcode