mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-29 17:19:50 +02:00
Code Issues Releases Wiki Activity

Laser_full_power is no longer needed

Browse Source
This commit is contained in:
Mitch Bradley
2021-07-08 08:25:01 -10:00
parent e0a0a77a75
commit e5610e7ab5
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Machine/Homing.h
View File

@@ -27,7 +27,7 @@ namespace Machine {
// The homing cycles are 1,2,3 etc. 0 means not homed as part of home-all, // 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 // 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 _square = false;
bool _positiveDirection = true; bool _positiveDirection = true;
float _mpos = 0.0f; // After homing this will be the mpos of the switch location float _mpos = 0.0f; // After homing this will be the mpos of the switch location

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

@@ -56,7 +56,7 @@ namespace Spindles {
_speeds.push_back({ 255, 100 }); _speeds.push_back({ 255, 100 });
} }
setupSpeeds(_laser_full_power); setupSpeeds(_pwm_period);
_pwm_chan_num = 0; // Channel 0 is reserved for spindle use _pwm_chan_num = 0; // Channel 0 is reserved for spindle use
} }

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

@@ -28,9 +28,6 @@
namespace Spindles { namespace Spindles {
// this is the same as a PWM spindle but the M4 compensation is supported. // this is the same as a PWM spindle but the M4 compensation is supported.
class Laser : public PWM { class Laser : public PWM {
private:
uint32_t _laser_full_power;
public: public:
Laser() = default; Laser() = default;
@@ -46,11 +43,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 "Laser"; } const char* name() const override { return "Laser"; }
void group(Configuration::HandlerBase& handler) override { void group(Configuration::HandlerBase& handler) override { PWM::group(handler); }
handler.item("laser_full_power", _laser_full_power);
PWM::group(handler);
}
~Laser() {} ~Laser() {}
}; };