mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 18:32:37 +02:00
Code Issues Releases Wiki Activity

Fixed some virtual / override problems

Browse Source 
In some cases, virtual and override were used simultaneously
In other cases, destructors were virtual in non-base classes.
This commit is contained in:
Mitch Bradley
2021-06-27 12:55:59 -10:00
parent e2599de958
commit ebd021ceac
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Spindles/10vSpindle.h
View File

@@ -55,7 +55,7 @@ namespace Spindles {
// Name of the configurable. Must match the name registered in the cpp file. // Name of the configurable. Must match the name registered in the cpp file.
const char* name() const override { return "10V"; } const char* name() const override { return "10V"; }
virtual ~_10v() {} ~_10v() {}
protected: protected:
void set_enable(bool enable_pin); void set_enable(bool enable_pin);

4
Grbl_Esp32/src/Spindles/BESCSpindle.h
View File

@@ -63,7 +63,7 @@ namespace Spindles {
void init() override; void init() override;
void config_message() override; void config_message() override;
virtual void set_output(uint32_t duty) override; void set_output(uint32_t duty) override;
// Configuration handlers: // Configuration handlers:
void validate() const override { PWM::validate(); } void validate() const override { PWM::validate(); }
@@ -80,6 +80,6 @@ namespace Spindles {
// Name of the configurable. Must match the name registered in the cpp file. // Name of the configurable. Must match the name registered in the cpp file.
const char* name() const override { return "BESC"; } const char* name() const override { return "BESC"; }
virtual ~BESC() {} ~BESC() {}
}; };
} }

2
Grbl_Esp32/src/Spindles/DacSpindle.h
View File

@@ -49,7 +49,7 @@ namespace Spindles {
// Name of the configurable. Must match the name registered in the cpp file. // Name of the configurable. Must match the name registered in the cpp file.
const char* name() const override { return "DAC"; } const char* name() const override { return "DAC"; }
virtual ~Dac() {} ~Dac() {}
private: private:
bool _gpio_ok; // DAC is on a valid pin bool _gpio_ok; // DAC is on a valid pin

2
Grbl_Esp32/src/Spindles/Laser.h
View File

@@ -52,6 +52,6 @@ namespace Spindles {
PWM::group(handler); PWM::group(handler);
} }
virtual ~Laser() {} ~Laser() {}
}; };
} }

2
Grbl_Esp32/src/Spindles/NullSpindle.h
View File

@@ -47,6 +47,6 @@ namespace Spindles {
// Name of the configurable. Must match the name registered in the cpp file. // Name of the configurable. Must match the name registered in the cpp file.
const char* name() const override { return "NoSpindle"; } const char* name() const override { return "NoSpindle"; }
virtual ~Null() {} ~Null() {}
}; };
} }

2
Grbl_Esp32/src/Spindles/OnOffSpindle.h
View File

@@ -36,7 +36,7 @@ namespace Spindles {
void init() override; void init() override;
virtual void setSpeedfromISR(uint32_t dev_speed) override; void setSpeedfromISR(uint32_t dev_speed) override;
void setState(SpindleState state, SpindleSpeed speed) override; void setState(SpindleState state, SpindleSpeed speed) override;
void config_message() override; void config_message() override;

4
Grbl_Esp32/src/Spindles/PWMSpindle.h
View File

@@ -41,7 +41,7 @@ namespace Spindles {
PWM& operator=(PWM&&) = delete; PWM& operator=(PWM&&) = delete;
void init() override; void init() override;
virtual void setSpeedfromISR(uint32_t dev_speed) override; void setSpeedfromISR(uint32_t dev_speed) override;
void setState(SpindleState state, SpindleSpeed speed) override; void setState(SpindleState state, SpindleSpeed speed) override;
void config_message() override; void config_message() override;
// Configuration handlers: // Configuration handlers:
@@ -67,7 +67,7 @@ namespace Spindles {
// Configurable // Configurable
uint32_t _pwm_freq = 5000; uint32_t _pwm_freq = 5000;
virtual void set_output(uint32_t duty) override; void set_output(uint32_t duty) override;
virtual void deinit(); virtual void deinit();
virtual void get_pins_and_settings(); virtual void get_pins_and_settings();

2
Grbl_Esp32/src/Spindles/RelaySpindle.h
View File

@@ -34,7 +34,7 @@ namespace Spindles {
Relay& operator=(const Relay&) = delete; Relay& operator=(const Relay&) = delete;
Relay& operator=(Relay&&) = delete; Relay& operator=(Relay&&) = delete;
virtual ~Relay() {} ~Relay() {}
// Configuration handlers: // Configuration handlers:

2
Grbl_Esp32/src/Spindles/Spindle.h
View File

@@ -98,7 +98,7 @@ namespace Spindles {
// TODO: Validate spinup/spindown delay? // TODO: Validate spinup/spindown delay?
} }
virtual void afterParse() override; void afterParse() override;
void group(Configuration::HandlerBase& handler) override { void group(Configuration::HandlerBase& handler) override {
handler.item("spinup_ms", _spinup_ms); handler.item("spinup_ms", _spinup_ms);