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

Merge branch 'YamlSettings' of https://github.com/bdring/Grbl_Esp32 into YamlSettings

This commit is contained in:
bdring
2021-07-08 13:19:49 -05:00
3 changed files with 6 additions and 4 deletions

View File

@@ -111,6 +111,8 @@ void grbl_init() {
sys.state = State::Idle;
}
limits_init();
// Check for power-up and set system alarm if homing is enabled to force homing cycle
// by setting Grbl's alarm state. Alarm locks out all g-code commands, including the
// startup scripts, but allows access to settings and internal commands. Only a homing
@@ -128,7 +130,6 @@ void grbl_init() {
Spindles::Spindle::switchSpindle(0, config->_spindles, spindle);
config->_coolant->init();
limits_init();
config->_probe->init();
}

View File

@@ -127,7 +127,7 @@ namespace Motors {
handler.item("invert_direction", _invert_direction);
handler.item("count_min", _countMin);
handler.item("count_max", _countMin);
handler.item("count_max", _countMax);
handler.item("full_time_move", _dynamixelFullTimeMove);
handler.section("uart", _uart);

View File

@@ -12,7 +12,8 @@ namespace Motors {
void init() override;
void set_disable(bool disable) override;
float _transition_poiont;
float _transition_point;
protected:
void config_message() override;
};