mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-03 11:22:38 +02:00
Code Issues Releases Wiki Activity

Turn off soft limits with max travel (#836)

Browse Source 
https://github.com/bdring/Grbl_Esp32/issues/831
This commit is contained in:
bdring
2021-03-25 14:50:18 -05:00
committed by GitHub
parent de2badf29d
commit bd9e57d6bb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Grbl.h
View File

@@ -22,7 +22,7 @@
// Grbl versioning system // Grbl versioning system
const char* const GRBL_VERSION = "1.3a"; const char* const GRBL_VERSION = "1.3a";
const char* const GRBL_VERSION_BUILD = "20210319"; const char* const GRBL_VERSION_BUILD = "20210320";
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>

3
Grbl_Esp32/src/Limits.cpp
View File

@@ -392,13 +392,14 @@ float limitsMinPosition(uint8_t axis) {
// Checks and reports if target array exceeds machine travel limits. // Checks and reports if target array exceeds machine travel limits.
// Return true if exceeding limits // Return true if exceeding limits
// Set $<axis>/MaxTravel=0 to selectively remove an axis from soft limit checks
bool limitsCheckTravel(float* target) { bool limitsCheckTravel(float* target) {
uint8_t idx; uint8_t idx;
auto n_axis = number_axis->get(); auto n_axis = number_axis->get();
for (idx = 0; idx < n_axis; idx++) { for (idx = 0; idx < n_axis; idx++) {
float max_mpos, min_mpos; float max_mpos, min_mpos;
if (target[idx] < limitsMinPosition(idx) || target[idx] > limitsMaxPosition(idx)) { if ((target[idx] < limitsMinPosition(idx) || target[idx] > limitsMaxPosition(idx)) && axis_settings[idx]->max_travel->get() > 0) {
return true; return true;
} }
} }

2
Grbl_Esp32/src/SettingsDefinitions.cpp
View File

@@ -301,7 +301,7 @@ void make_settings() {
} }
for (axis = MAX_N_AXIS - 1; axis >= 0; axis--) { for (axis = MAX_N_AXIS - 1; axis >= 0; axis--) {
def = &axis_defaults[axis]; def = &axis_defaults[axis];
auto setting = new FloatSetting(GRBL, WG, makeGrblName(axis, 130), makename(def->name, "MaxTravel"), def->max_travel, 1.0, 100000.0); auto setting = new FloatSetting(GRBL, WG, makeGrblName(axis, 130), makename(def->name, "MaxTravel"), def->max_travel, 0, 100000.0);
setting->setAxis(axis); setting->setAxis(axis);
axis_settings[axis]->max_travel = setting; axis_settings[axis]->max_travel = setting;
} }