diff --git a/Grbl_Esp32/src/Machine/Homing.h b/Grbl_Esp32/src/Machine/Homing.h index 632d7c10..c185ec41 100644 --- a/Grbl_Esp32/src/Machine/Homing.h +++ b/Grbl_Esp32/src/Machine/Homing.h @@ -27,7 +27,7 @@ namespace Machine { // The homing cycles are 1,2,3 etc. 0 means not homed as part of home-all, // but you can still home it manually with e.g. $HA - int _cycle = -1; // what homing cycle does this axis home on? + int _cycle = -1; // what auto-homing cycle does this axis home on? bool _square = false; bool _positiveDirection = true; float _mpos = 0.0f; // After homing this will be the mpos of the switch location diff --git a/Grbl_Esp32/src/Spindles/Laser.cpp b/Grbl_Esp32/src/Spindles/Laser.cpp index ea7ea629..0964412d 100644 --- a/Grbl_Esp32/src/Spindles/Laser.cpp +++ b/Grbl_Esp32/src/Spindles/Laser.cpp @@ -56,7 +56,7 @@ namespace Spindles { _speeds.push_back({ 255, 100 }); } - setupSpeeds(_laser_full_power); + setupSpeeds(_pwm_period); _pwm_chan_num = 0; // Channel 0 is reserved for spindle use } diff --git a/Grbl_Esp32/src/Spindles/Laser.h b/Grbl_Esp32/src/Spindles/Laser.h index 352cb90b..ff321191 100644 --- a/Grbl_Esp32/src/Spindles/Laser.h +++ b/Grbl_Esp32/src/Spindles/Laser.h @@ -28,9 +28,6 @@ namespace Spindles { // this is the same as a PWM spindle but the M4 compensation is supported. class Laser : public PWM { - private: - uint32_t _laser_full_power; - public: Laser() = default; @@ -46,11 +43,7 @@ namespace Spindles { // Name of the configurable. Must match the name registered in the cpp file. const char* name() const override { return "Laser"; } - void group(Configuration::HandlerBase& handler) override { - handler.item("laser_full_power", _laser_full_power); - - PWM::group(handler); - } + void group(Configuration::HandlerBase& handler) override { PWM::group(handler); } ~Laser() {} };