From 90ec8b389953fd97e5299cb74f8624b1a4f1bfce Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sun, 27 Jan 2019 14:01:59 +0200
Subject: [PATCH] - modified grbl_laser postprocessor file so it includes a
 Sxxxx command on the line with M02 (laser active) whenever a value is enter
 in the Spindlespeed entry field

---
 ObjectUI.py                  |  5 +++--
 README.md                    |  1 +
 postprocessors/grbl_laser.py | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ObjectUI.py b/ObjectUI.py
index e8ad7bc9..d16bf157 100644
--- a/ObjectUI.py
+++ b/ObjectUI.py
@@ -970,8 +970,9 @@ class GeometryObjectUI(ObjectUI):
         # Spindlespeed
         spdlabel = QtWidgets.QLabel('Spindle speed:')
         spdlabel.setToolTip(
-            "Speed of the spindle\n"
-            "in RPM (optional)"
+            "Speed of the spindle in RPM (optional).\n"
+            "If LASER postprocessor is used,\n"
+            "this value is the power of laser."
         )
         self.grid3.addWidget(spdlabel, 14, 0)
         self.cncspindlespeed_entry = IntEntry(allow_empty=True)
diff --git a/README.md b/README.md
index de19f390..c00eb022 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing.
 - added options for trace segmentation that can be useful for auto-levelling (code snippet from Lei Zheng from a rejected pull request on FlatCAM https://bitbucket.org/realthunder/ )
 - added shortcut key 'L' for creating 'New Excellon' 
 - added shortcut key combo 'SHIFT+S' for Running a Script.
+- modified grbl_laser postprocessor file so it includes a Sxxxx command on the line with M02 (laser active) whenever a value is enter in the Spindlespeed entry field
 
 26.01.2019
 
diff --git a/postprocessors/grbl_laser.py b/postprocessors/grbl_laser.py
index e0344ca6..72611f00 100644
--- a/postprocessors/grbl_laser.py
+++ b/postprocessors/grbl_laser.py
@@ -36,7 +36,10 @@ class grbl_laser(FlatCAMPostProc):
         return 'M05'
 
     def down_code(self, p):
-        return 'M03'
+        if p.spindlespeed:
+            return 'M03 S%d' % p.spindlespeed
+        else:
+            return 'M03'
 
     def toolchange_code(self, p):
         return ''
@@ -67,10 +70,7 @@ class grbl_laser(FlatCAMPostProc):
         return 'G01 F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate_z))
 
     def spindle_code(self, p):
-        if p.spindlespeed:
-            return 'S%d' % p.spindlespeed
-        else:
-            return ''
+        return ''
 
     def dwell_code(self, p):
         return ''