mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-18 20:31:35 +02:00
Code Issues Releases Wiki Activity

Axis config sanity checking

Browse Source
This commit is contained in:
Mitch Bradley
2021-06-03 22:12:08 -10:00
parent 34ee18317b
commit 26204b84e6
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Grbl_Esp32/src/MachineConfig.cpp
View File

@@ -129,13 +129,17 @@ void Axes::init() {
// certain motors need features to be turned on. Check them here // certain motors need features to be turned on. Check them here
for (uint8_t axis = X_AXIS; axis < _numberAxis; axis++) { for (uint8_t axis = X_AXIS; axis < _numberAxis; axis++) {
for (uint8_t gang_index = 0; gang_index < Axis::MAX_NUMBER_GANGED; gang_index++) { for (uint8_t gang_index = 0; gang_index < Axis::MAX_NUMBER_GANGED; gang_index++) {
auto& a = _axis[axis]->_gangs[gang_index]->_motor; auto a = _axis[axis];
if (a) {
if (a == nullptr) { auto g = a->_gangs[gang_index];
a = new Motors::Nullmotor(); if (g) {
auto m = g->_motor;
if (m == nullptr) {
m = new Motors::Nullmotor();
}
m->init();
}
} }
a->init();
} }
} }
} }
@@ -168,8 +172,21 @@ void Axes::read_settings() {
//info_serial("Read Settings"); //info_serial("Read Settings");
for (uint8_t axis = X_AXIS; axis < _numberAxis; axis++) { for (uint8_t axis = X_AXIS; axis < _numberAxis; axis++) {
for (uint8_t gang_index = 0; gang_index < Axis::MAX_NUMBER_GANGED; gang_index++) { for (uint8_t gang_index = 0; gang_index < Axis::MAX_NUMBER_GANGED; gang_index++) {
auto a = _axis[axis]->_gangs[gang_index]->_motor; auto a = _axis[axis];
a->read_settings(); if (!a) {
log_info("No specification for axis " << axis);
break;
}
auto g = a->_gangs[gang_index];
if (!g) {
log_info("No specification for axis " << axis << " gang " << gang_index);
break;
}
auto m = g->_motor;
if (!m) {
log_info("No motor for axis " << axis << " gang " << gang_index);
}
m->read_settings();
} }
} }
} }