Ignores disable

bdring · Apr 16, 2022 · 3f52ca4 · MitchBradley · Apr 16, 2022 · 3f52ca4
1 parent bc2a117
commit 3f52ca4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/FluidNC/src/Motors/RcServo.h b/FluidNC/src/Motors/RcServo.h
@@ -37,7 +37,7 @@ namespace MotorDrivers {
         void init() override;
         void read_settings() override;
         bool set_homing_mode(bool isHoming) override;
-        void set_disable(bool disable) override;
+        virtual void set_disable(bool disable) override;
         void update() override;
 
         void _write_pwm(uint32_t duty);

diff --git a/FluidNC/src/Motors/Solenoid.cpp b/FluidNC/src/Motors/Solenoid.cpp
@@ -65,8 +65,6 @@ namespace MotorDrivers {
         _pwm_chan_num     = ledcInit(_output_pin, -1, double(_pwm_freq), SERVO_PWM_RESOLUTION_BITS);  // Allocate a channel
         _current_pwm_duty = 0;
 
-        _disabled = true;
-
         startUpdateTask(_update_rate_ms);
     }
 
@@ -80,7 +78,7 @@ namespace MotorDrivers {
     void Solenoid::set_location() {
         bool is_solenoid_on;
 
-        if (_disabled || _has_errors) {
+        if (_has_errors) {
             return;
         }
 
@@ -120,6 +118,8 @@ namespace MotorDrivers {
         _write_pwm(pwm_cnt[_current_mode]);
     }
 
+    void Solenoid::set_disable(bool disable) {}  // NOP
+
     namespace {
         MotorFactory::InstanceBuilder<Solenoid> registration("solenoid");
     }

diff --git a/FluidNC/src/Motors/Solenoid.h b/FluidNC/src/Motors/Solenoid.h
@@ -33,6 +33,7 @@ namespace MotorDrivers {
 
         void set_location();
         void init() override;
+        void set_disable(bool disable) override;
 
         float _transition_point;