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

Fixed dependency bug between old and new settings

Browse Source
This commit is contained in:
Stefan de Bruijn
2021-06-20 20:36:05 +02:00
parent 3afb5a1b6a
commit 6e4876da2e
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Grbl_Esp32/src/Grbl.cpp
View File

@@ -24,6 +24,8 @@
#include <WiFi.h> #include <WiFi.h>
#include <SPIFFS.h> #include <SPIFFS.h>
extern void make_grbl_commands();
void grbl_init() { void grbl_init() {
try { try {
client_init(); // Setup serial baud rate and interrupts client_init(); // Setup serial baud rate and interrupts
@@ -50,8 +52,9 @@ void grbl_init() {
// Load Grbl settings from non-volatile storage // Load Grbl settings from non-volatile storage
debug_serial("Initializing settings..."); debug_serial("Initializing settings...");
settings_init(); settings_init(); // requires config
config->load(config_filename->get()); config->load(config_filename->get());
make_grbl_commands();
info_serial("Name: %s", config->_name.c_str()); info_serial("Name: %s", config->_name.c_str());
info_serial("Board: %s", config->_board.c_str()); info_serial("Board: %s", config->_board.c_str());

5
Grbl_Esp32/src/MachineConfig.h
View File

@@ -364,6 +364,11 @@ public:
bool _homingInitLock = false; bool _homingInitLock = false;
int _stepType = ST_RMT; int _stepType = ST_RMT;
// Enables a special set of M-code commands that enables and disables the parking motion.
// These are controlled by `M56`, `M56 P1`, or `M56 Px` to enable and `M56 P0` to disable.
// The command is modal and will be set after a planner sync. Since it is GCode, it is
// executed in sync with GCode commands. It is not a real-time command.
bool _enableParkingOverrideControl = false; bool _enableParkingOverrideControl = false;
bool _deactivateParkingUponInit = false; bool _deactivateParkingUponInit = false;
bool _homingSingleAxisCommands = false; bool _homingSingleAxisCommands = false;

1
Grbl_Esp32/src/ProcessSettings.cpp
View File

@@ -84,7 +84,6 @@ namespace WebUI {
void settings_init() { void settings_init() {
make_settings(); make_settings();
WebUI::make_web_settings(); WebUI::make_web_settings();
make_grbl_commands();
load_settings(); load_settings();
} }