From ae03820245abe4a28e6ca9f44dc94a6c2df01812 Mon Sep 17 00:00:00 2001
From: Orob-Maslow <59507087+Orob-Maslow@users.noreply.github.com>
Date: Sat, 12 Sep 2020 21:41:39 -0500
Subject: [PATCH 1/2] Spindle speed control support

for firmware supporting spindle speed control, advanced settings for speed control max and min limits as well as settings for the relay type to be active high or active low with spindle speed control.   Relay functions as before, but an additional pwm pin is designated by the firmware to control the speed.  speed is scaled 0 to max and min is the turn-on speed minimum.
---
 DataStructures/data.py |  6 ++++++
 defaultwebcontrol.json | 26 ++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/DataStructures/data.py b/DataStructures/data.py
index 6908c7a4..7b75e988 100644
--- a/DataStructures/data.py
+++ b/DataStructures/data.py
@@ -35,6 +35,12 @@ class Data:
     controllerFirmwareVersion = 0
 
     '''
+    interpreter version
+    if using a compiler newer than 3.5, use the newer string format methods without %'s
+    '''
+    pythonVersion35 = False  
+    
+    '''l
     Version Updater
     '''
     lastChecked = -1
diff --git a/defaultwebcontrol.json b/defaultwebcontrol.json
index cb89a05e..ec87691c 100644
--- a/defaultwebcontrol.json
+++ b/defaultwebcontrol.json
@@ -121,20 +121,42 @@
         },
         {
             "default": "None",
-            "desc": "How should the spindle start and stop automatically based on gcode? Leave off for none, or set external servo control, or external relay control, active high or low.\ndefault setting: None",
+            "desc": "How should the spindle start and stop automatically based on gcode? Leave off for none, or set external servo control, or external relay control, active high or low.  Speed control uses pin 45 in 51.29 firmware\ndefault setting: None",
             "firmwareKey": 17,
             "key": "spindleAutomate",
             "options": [
                 "None",
                 "Servo",
                 "Relay_High",
-                "Relay_Low"
+                "Relay_Low",
+                "SPEED_CTRL_RELAY_HIGH",
+                "SPEED_CTRL_RELAY_LOW"
             ],
             "section": "Advanced Settings",
             "title": "Spindle Automation",
             "type": "options",
             "value": "None"
         },
+        {
+            "default": "None",
+            "desc": "Spindle start speed absolute minimum\ndefault setting: 4000",
+            "firmwareKey": 60,
+            "key": "spindleMin",
+            "section": "Advanced Settings",
+            "title": "Spindle Speed Minimum",
+            "type": "string",
+            "value": "4000"
+        },
+        {
+            "default": "None",
+            "desc": "Spindle maximum speed\ndefault setting: 24000",
+            "firmwareKey": 61,
+            "key": "spindleMax",
+            "section": "Advanced Settings",
+            "title": "Spindle Speed Maximum",
+            "type": "string",
+            "value": "24000"
+        },
         {
             "default": 800,
             "desc": "The maximum feedrate in mm/min that machine is capable of sustaining.  Setting this value too high will cause movements to start before the prior movement finishes.\ndefault setting: 800",

From c0641e80402033c9ceebe17a35da1d7578d1234a Mon Sep 17 00:00:00 2001
From: Orob-Maslow <59507087+Orob-Maslow@users.noreply.github.com>
Date: Sat, 12 Sep 2020 21:44:37 -0500
Subject: [PATCH 2/2] Update data.py

removed a line
---
 DataStructures/data.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/DataStructures/data.py b/DataStructures/data.py
index 7b75e988..ec95964e 100644
--- a/DataStructures/data.py
+++ b/DataStructures/data.py
@@ -33,7 +33,6 @@ class Data:
     customFirmwareVersion = None
     holeyFirmwareVersion = None
     controllerFirmwareVersion = 0
-
     '''
     interpreter version
     if using a compiler newer than 3.5, use the newer string format methods without %'s