mirror of
https://github.com/bdring/Grbl_Esp32.git
synced 2025-08-30 17:49:56 +02:00
Fixed dependency bug between old and new settings
This commit is contained in:
@@ -24,6 +24,8 @@
|
||||
#include <WiFi.h>
|
||||
#include <SPIFFS.h>
|
||||
|
||||
extern void make_grbl_commands();
|
||||
|
||||
void grbl_init() {
|
||||
try {
|
||||
client_init(); // Setup serial baud rate and interrupts
|
||||
@@ -50,8 +52,9 @@ void grbl_init() {
|
||||
|
||||
// Load Grbl settings from non-volatile storage
|
||||
debug_serial("Initializing settings...");
|
||||
settings_init();
|
||||
settings_init(); // requires config
|
||||
config->load(config_filename->get());
|
||||
make_grbl_commands();
|
||||
|
||||
info_serial("Name: %s", config->_name.c_str());
|
||||
info_serial("Board: %s", config->_board.c_str());
|
||||
|
@@ -364,6 +364,11 @@ public:
|
||||
bool _homingInitLock = false;
|
||||
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 _deactivateParkingUponInit = false;
|
||||
bool _homingSingleAxisCommands = false;
|
||||
|
@@ -84,7 +84,6 @@ namespace WebUI {
|
||||
void settings_init() {
|
||||
make_settings();
|
||||
WebUI::make_web_settings();
|
||||
make_grbl_commands();
|
||||
load_settings();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user