From b42c45be1bb1c5e445f2480d8fe7340a37d1ddba Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Wed, 17 Oct 2018 12:19:17 -0700
Subject: [PATCH] Fix spindle stoping problem

---
 src/avr/src/huanyang.c    | 1 -
 src/avr/src/huanyang.h    | 1 -
 src/avr/src/pwm_spindle.c | 1 -
 src/avr/src/pwm_spindle.h | 1 -
 src/avr/src/spindle.c     | 9 +--------
 src/avr/src/vfd_spindle.c | 1 -
 src/avr/src/vfd_spindle.h | 1 -
 7 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/avr/src/huanyang.c b/src/avr/src/huanyang.c
index 838ddbf..8c82115 100644
--- a/src/avr/src/huanyang.c
+++ b/src/avr/src/huanyang.c
@@ -287,7 +287,6 @@ void huanyang_set(float speed) {
 
 
 float huanyang_get() {return hy.actual_freq / hy.max_freq;}
-void huanyang_stop() {huanyang_set(0);}
 
 
 float get_hy_freq() {return hy.actual_freq;}
diff --git a/src/avr/src/huanyang.h b/src/avr/src/huanyang.h
index 2a05c8b..5c51c00 100644
--- a/src/avr/src/huanyang.h
+++ b/src/avr/src/huanyang.h
@@ -34,7 +34,6 @@ void huanyang_init();
 void huanyang_deinit(deinit_cb_t cb);
 void huanyang_set(float speed);
 float huanyang_get();
-void huanyang_stop();
 
 
 /// See Huanyang VFD user manual
diff --git a/src/avr/src/pwm_spindle.c b/src/avr/src/pwm_spindle.c
index a510eba..e863881 100644
--- a/src/avr/src/pwm_spindle.c
+++ b/src/avr/src/pwm_spindle.c
@@ -141,7 +141,6 @@ void pwm_spindle_set(float speed) {
 
 
 float pwm_spindle_get() {return spindle.speed;}
-void pwm_spindle_stop() {pwm_spindle_set(0);}
 
 
 // Var callbacks
diff --git a/src/avr/src/pwm_spindle.h b/src/avr/src/pwm_spindle.h
index 132e94b..1d467a1 100644
--- a/src/avr/src/pwm_spindle.h
+++ b/src/avr/src/pwm_spindle.h
@@ -34,4 +34,3 @@ void pwm_spindle_init();
 void pwm_spindle_deinit(deinit_cb_t cb);
 void pwm_spindle_set(float speed);
 float pwm_spindle_get();
-void pwm_spindle_stop();
diff --git a/src/avr/src/spindle.c b/src/avr/src/spindle.c
index 48c58a8..e0d5e04 100644
--- a/src/avr/src/spindle.c
+++ b/src/avr/src/spindle.c
@@ -85,14 +85,7 @@ float spindle_get_speed() {
 }
 
 
-void spindle_stop() {
-  switch (spindle.type) {
-  case SPINDLE_TYPE_DISABLED: break;
-  case SPINDLE_TYPE_PWM: pwm_spindle_stop(); break;
-  case SPINDLE_TYPE_HUANYANG: huanyang_stop(); break;
-  default: vfd_spindle_stop(); break;
-  }
-}
+void spindle_stop() {spindle_set_speed(0);}
 
 
 bool spindle_is_reversed() {return spindle.reversed;}
diff --git a/src/avr/src/vfd_spindle.c b/src/avr/src/vfd_spindle.c
index 79acc7f..591d96f 100644
--- a/src/avr/src/vfd_spindle.c
+++ b/src/avr/src/vfd_spindle.c
@@ -355,7 +355,6 @@ void vfd_spindle_set(float speed) {
 
 
 float vfd_spindle_get() {return vfd.actual_speed;}
-void vfd_spindle_stop() {vfd_spindle_set(0);}
 
 
 void vfd_spindle_rtc_callback() {
diff --git a/src/avr/src/vfd_spindle.h b/src/avr/src/vfd_spindle.h
index db7375f..17de4f6 100644
--- a/src/avr/src/vfd_spindle.h
+++ b/src/avr/src/vfd_spindle.h
@@ -34,5 +34,4 @@ void vfd_spindle_init();
 void vfd_spindle_deinit(deinit_cb_t cb);
 void vfd_spindle_set(float speed);
 float vfd_spindle_get();
-void vfd_spindle_stop();
 void vfd_spindle_rtc_callback();
-- 
2.27.0