From 93bd483c442b2a2527c796ab3f2394d934b577b7 Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Tue, 27 Nov 2018 15:05:44 -0800
Subject: [PATCH] Removed tool-reversed option.  Use tool-direction-mode
 instead.

---
 src/avr/src/spindle.c              | 14 ++------------
 src/avr/src/vars.def               |  1 -
 src/resources/config-template.json |  5 -----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/avr/src/spindle.c b/src/avr/src/spindle.c
index dacf806..0a32cbc 100644
--- a/src/avr/src/spindle.c
+++ b/src/avr/src/spindle.c
@@ -49,7 +49,6 @@ static struct {
   float override;
   sync_speed_t sync_speed;
   float speed;
-  bool reversed;
   float min_rpm;
   float max_rpm;
   float inv_max_rpm;
@@ -84,7 +83,7 @@ static float _speed_to_power(float speed) {
   else if (spindle.max_rpm <= power) power = 1;
   else power *= spindle.inv_max_rpm;
 
-  return (spindle.reversed ^ negative) ? -power : power;
+  return negative ? -power : power;
 }
 
 
@@ -214,18 +213,9 @@ void spindle_estop() {_set_type(SPINDLE_TYPE_DISABLED);}
 // Var callbacks
 uint8_t get_tool_type() {return spindle.type;}
 void set_tool_type(uint8_t value) {_set_type((spindle_type_t)value);}
-float get_speed() {return _get_power() * spindle.max_rpm;}
-bool get_tool_reversed() {return spindle.reversed;}
-
-
-void set_tool_reversed(bool reversed) {
-  if (spindle.reversed != reversed) {
-    spindle.reversed = reversed;
-    _update_speed();
-  }
-}
 
 
+float get_speed() {return _get_power() * spindle.max_rpm;}
 float get_max_spin() {return spindle.max_rpm;}
 
 
diff --git a/src/avr/src/vars.def b/src/avr/src/vars.def
index 52c4258..e5a206d 100644
--- a/src/avr/src/vars.def
+++ b/src/avr/src/vars.def
@@ -85,7 +85,6 @@ VAR(analog_input,    ai, f32,   ANALOG, 0, 0) // Analog input pins
 // Spindle
 VAR(tool_type,       st, u8,    0,      1, 1) // See spindle.c
 VAR(speed,            s, f32,   0,      0, 1) // Current spindle speed
-VAR(tool_reversed,   sr, b8,    0,      1, 1) // Reverse tool
 VAR(max_spin,        sx, f32,   0,      1, 1) // Maximum spindle speed
 VAR(min_spin,        sm, f32,   0,      1, 1) // Minimum spindle speed
 
diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index a9a275b..50a94c1 100644
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -198,11 +198,6 @@
       "default": "Disabled",
       "code": "st"
     },
-    "tool-reversed": {
-      "type": "bool",
-      "default": false,
-      "code": "sr"
-    },
     "max-spin": {
       "type": "float",
       "unit": "RPM",
-- 
2.27.0