From 69607816d0aea3341365f1159c675581d37c59ee Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Fri, 28 Feb 2020 01:12:39 +0200
Subject: [PATCH] - some small changes in preprocessors

---
 README.md                                                   | 4 ++++
 ...{Marlin_laser_use_FAN_pin.py => Marlin_laser_FAN_pin.py} | 6 +++---
 ...laser_use_Spindle_pin.py => Marlin_laser_Spindle_pin.py} | 2 +-
 .../{Toolchange_manual.py => Toolchange_Manual.py}          | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
 rename preprocessors/{Marlin_laser_use_FAN_pin.py => Marlin_laser_FAN_pin.py} (96%)
 rename preprocessors/{Marlin_laser_use_Spindle_pin.py => Marlin_laser_Spindle_pin.py} (98%)
 rename preprocessors/{Toolchange_manual.py => Toolchange_Manual.py} (99%)

diff --git a/README.md b/README.md
index 3c172ff0..df9ef53c 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+28.02.2020
+
+- some small changes in preprocessors
+
 25.02.2020
 
 - fixed bug in Gerber parser: it tried to calculate a len() for a single element and not a list - a Gerber generated by Eagle exhibited this
diff --git a/preprocessors/Marlin_laser_use_FAN_pin.py b/preprocessors/Marlin_laser_FAN_pin.py
similarity index 96%
rename from preprocessors/Marlin_laser_use_FAN_pin.py
rename to preprocessors/Marlin_laser_FAN_pin.py
index 9e5f33a7..fb515d5f 100644
--- a/preprocessors/Marlin_laser_use_FAN_pin.py
+++ b/preprocessors/Marlin_laser_FAN_pin.py
@@ -9,7 +9,7 @@
 from FlatCAMPostProc import *
 
 
-class Marlin_laser_use_FAN_pin(FlatCAMPostProc):
+class Marlin_laser_FAN_pin(FlatCAMPostProc):
 
     include_header = True
     coordinate_format = "%.*f"
@@ -107,7 +107,7 @@ class Marlin_laser_use_FAN_pin(FlatCAMPostProc):
 
     def spindle_code(self, p):
         if p.spindlespeed:
-            return '%s S%s' % ('M106 ', str(p.spindlespeed))
+            return 'M106 S%s' % str(p.spindlespeed)
         else:
             return 'M106'
 
@@ -116,5 +116,5 @@ class Marlin_laser_use_FAN_pin(FlatCAMPostProc):
 
     def spindle_stop_code(self, p):
         gcode = 'M400\n'
-        gcode += 'M107'
+        gcode += 'M106 S0'
         return gcode
diff --git a/preprocessors/Marlin_laser_use_Spindle_pin.py b/preprocessors/Marlin_laser_Spindle_pin.py
similarity index 98%
rename from preprocessors/Marlin_laser_use_Spindle_pin.py
rename to preprocessors/Marlin_laser_Spindle_pin.py
index 7f40bca4..370d0c33 100644
--- a/preprocessors/Marlin_laser_use_Spindle_pin.py
+++ b/preprocessors/Marlin_laser_Spindle_pin.py
@@ -9,7 +9,7 @@
 from FlatCAMPostProc import *
 
 
-class Marlin_laser_use_Spindle_pin(FlatCAMPostProc):
+class Marlin_laser_Spindle_pin(FlatCAMPostProc):
 
     include_header = True
     coordinate_format = "%.*f"
diff --git a/preprocessors/Toolchange_manual.py b/preprocessors/Toolchange_Manual.py
similarity index 99%
rename from preprocessors/Toolchange_manual.py
rename to preprocessors/Toolchange_Manual.py
index 7b2eb561..432a0013 100644
--- a/preprocessors/Toolchange_manual.py
+++ b/preprocessors/Toolchange_Manual.py
@@ -9,7 +9,7 @@
 from FlatCAMPostProc import *
 
 
-class Toolchange_manual(FlatCAMPostProc):
+class Toolchange_Manual(FlatCAMPostProc):
 
     include_header = True
     coordinate_format = "%.*f"