mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 19:02:35 +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:
Stefan de Bruijn
2021-07-05 21:25:38 +02:00
parent c785ae3332 1bd58f4aea
commit 7e153cdb26
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Grbl_Esp32/src/Limits.cpp
View File

@@ -393,7 +393,7 @@ void limits_run_homing_cycles(AxisMask axis_mask) {
auto axisConfig = config->_axes->_axis[axis]; auto axisConfig = config->_axes->_axis[axis];
auto homing = axisConfig->_homing; auto homing = axisConfig->_homing;
if (homing && homing->_cycle == cycle) { if (homing && homing->_cycle == cycle) {
bitnum_istrue(axis_mask, axis); bitnum_true(axis_mask, axis);
} }
} }
@@ -590,7 +590,7 @@ bool WEAK_LINK limitsCheckTravel(float* target) {
auto axes = config->_axes; auto axes = config->_axes;
auto n_axis = axes->_numberAxis; auto n_axis = axes->_numberAxis;
for (int axis = 0; axis < n_axis; axis++) { for (int axis = 0; axis < n_axis; axis++) {
auto axisSetting = axes->_axis[axis]; auto axisSetting = axes->_axis[axis];
if ((target[axis] < limitsMinPosition(axis) || target[axis] > limitsMaxPosition(axis)) && axisSetting->_maxTravel > 0) { if ((target[axis] < limitsMinPosition(axis) || target[axis] > limitsMaxPosition(axis)) && axisSetting->_maxTravel > 0) {
return true; return true;
} }