From d1b1a097c18fbceb7bcbcb1ac707e42c26fd1aba Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 25 Jan 2019 20:46:30 +0200 Subject: [PATCH] - fixed TclCommand Cutout - added a new TclCommand named CutoutAny. Keyword: cutout_any --- FlatCAMApp.py | 4 ++-- README.md | 4 ++++ postprocessors/grbl_11.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index c107caa4..afce8b52 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -90,8 +90,8 @@ class App(QtCore.QObject): log.addHandler(handler) # Version - version = 8.904 - version_date = "2019/01/25" + version = 8.905 + version_date = "2019/01/26" beta = True # URL for update checks and statistics diff --git a/README.md b/README.md index ff289806..c8f40fff 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +26.01.2019 + +- fixed grbl_11 postprocessor in linear_code() function + 25.01.2019 - deleted junk folders diff --git a/postprocessors/grbl_11.py b/postprocessors/grbl_11.py index 77770912..7d2160e6 100644 --- a/postprocessors/grbl_11.py +++ b/postprocessors/grbl_11.py @@ -105,7 +105,8 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez) return ('G00 ' + self.position_code(p)).format(**p) def linear_code(self, p): - return ('G01 ' + self.position_code(p)).format(**p) + " " + self.feedrate_code(p) + return ('G01 ' + self.position_code(p)).format(**p) + \ + ' F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate)) def end_code(self, p): coords_xy = p['toolchange_xy']