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

Reinstated locate_scaler, defaulting it to 1.0

Browse Source
This commit is contained in:
Mitch Bradley
2021-07-01 14:06:03 -10:00
parent 5e698f2a09
commit 2813938c9f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Grbl_Esp32/src/Limits.cpp
View File

@@ -191,9 +191,8 @@ void limits_go_home(uint8_t cycle_mask, uint32_t n_locate_cycles) {
// Scale the target array, currently in units of time, back to positions
// Add a small fudge factor to ensure that the limit is reached
for (int axis = 0; axis < n_axis; axis++) {
auto axisConfig = config->_axes->_axis[axis];
auto homing = axisConfig->_homing;
auto scaler = approach ? homing->_search_scaler : 1.0;
auto homing = config->_axes->_axis[axis]->_homing;
auto scaler = approach ? homing->_search_scaler : homing->_locate_scaler;
if (bitnum_istrue(axislock, axis)) {
target[axis] *= limitingRate * scaler;
}

2
Grbl_Esp32/src/Machine/Homing.h
View File

@@ -34,7 +34,7 @@ namespace Machine {
float _pulloff = 1.0f; // mm
int _debounce = 250; // ms settling time for homing switches after motion
float _search_scaler = 1.1f; // multiplied by max travel for max homing distance on first touch
float _locate_scaler = 5.0f;
float _locate_scaler = 1.0f;
// Configuration system helpers:
void validate() const override { Assert(_cycle >= 1, "Cycle has to be defined as >= 1 for homing sequence."); }