Просмотр исходного кода

- added to the postprocessor files the command after toolchange to go with G00 (fastest) to "Z Move" value of Z pozition.

Marius Stanciu 7 лет назад
Родитель
Сommit
53d50c799f

+ 1 - 1
FlatCAMApp.py

@@ -91,7 +91,7 @@ class App(QtCore.QObject):
 
     # Version
     version = 8.906
-    version_date = "2019/01/30"
+    version_date = "2019/02/1"
     beta = True
 
     # URL for update checks and statistics

+ 1 - 0
README.md

@@ -21,6 +21,7 @@ CAD program, and create G-Code for Isolation routing.
 - more fixes in camlib.CNCJob regarding usage of toolchange (in case it is None)
 - fixed postprocessor files to work with toolchange_xy parameter value = None (no values in Edit - Preferences fields)
 - fixed Tcl commands CncJob and DrillCncJob to work with toolchange
+- added to the postprocessor files the command after toolchange to go with G00 (fastest) to "Z Move" value of Z pozition.
 
 29.01.2019
 

+ 2 - 0
postprocessors/default.py

@@ -112,6 +112,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
              t_drills=no_drills,
              toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
         else:
@@ -137,6 +138,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
              tool=int(p.tool),
              toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
     def up_to_zero_code(self, p):

+ 2 - 0
postprocessors/grbl_11.py

@@ -111,6 +111,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
              t_drills=no_drills,
              toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
         else:
@@ -136,6 +137,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
              tool=int(p.tool),
              toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
     def up_to_zero_code(self, p):

+ 3 - 1
postprocessors/manual_toolchange.py

@@ -123,6 +123,7 @@ M0
            t_drills=no_drills,
            toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
         else:
@@ -143,7 +144,7 @@ M0
            tool=int(p.tool),
            toolC=toolC_formatted)
             else:
-                                gcode =  """G00 Z{toolchangez}
+                gcode =  """G00 Z{toolchangez}
 T{tool}
 M5  
 (MSG, Change to Tool Dia = {toolC})
@@ -156,6 +157,7 @@ M0
            tool=int(p.tool),
            toolC=toolC_formatted)
 
+            gcode += 'G00 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
     def up_to_zero_code(self, p):

+ 2 - 0
postprocessors/marlin.py

@@ -112,6 +112,7 @@ M0""".format(toolchangez=self.coordinate_format % (p.coords_decimals, toolchange
              t_drills=no_drills,
              toolC=toolC_formatted)
 
+            gcode += 'G0 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
         else:
@@ -137,6 +138,7 @@ M0""".format(toolchangez=self.coordinate_format%(p.coords_decimals, toolchangez)
              tool=int(p.tool),
              toolC=toolC_formatted)
 
+            gcode += 'G0 Z%.*f' % (p.coords_decimals, p.zmove)
             return gcode
 
     def up_to_zero_code(self, p):