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

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

Browse Source
This commit is contained in:
bdring
2021-07-08 13:19:49 -05:00
parent ab37c7b491 0191e8ca0c
commit 69b14f3ee3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Grbl_Esp32/src/Grbl.cpp
View File

@@ -111,6 +111,8 @@ void grbl_init() {
sys.state = State::Idle; sys.state = State::Idle;
} }
limits_init();
// Check for power-up and set system alarm if homing is enabled to force homing cycle // 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 // 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 // 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); Spindles::Spindle::switchSpindle(0, config->_spindles, spindle);
config->_coolant->init(); config->_coolant->init();
limits_init();
config->_probe->init(); config->_probe->init();
} }

2
Grbl_Esp32/src/Motors/Dynamixel2.h
View File

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

5
Grbl_Esp32/src/Motors/Solenoid.h
View File

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