Fix spindle stoping problem

diff --git a/src/avr/src/huanyang.c b/src/avr/src/huanyang.c
index 838ddbf2d02d43af87a409c725a3bb37f198b7a4..8c82115e72e46e4775673c508bba539d119cb0cf 100644 (file)
--- 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 2a05c8b4bb0e4c436740ed61affad2408f82fce1..5c51c004d9b331ce1e79e8503a61d3cc08ab0562 100644 (file)
--- 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 a510eba69930c0440cf583e3089e3f537fb12551..e86388177b7288fa4c3355224a58bad30252838a 100644 (file)
--- 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 132e94b486a426b1acc22b3b2445b3cf79059e3c..1d467a1702d0721cc0af1bf0d44d3e45767a0a49 100644 (file)
--- 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 48c58a8b0cd345f16ddc8141ca8cba377657867b..e0d5e0488d53822535dd73986fa486cc31aebdef 100644 (file)
--- 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 79acc7fdf7332246a517d4c723a600f93a3f19a2..591d96f5274118a1a1e372f0d9bdae3a489db2d6 100644 (file)
--- 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 db7375f189c2516229c69a647fdb7c20465aa4d1..17de4f65f26f45eae759c40ffba6652034bdc985 100644 (file)
--- 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();