andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix a G34 bug, allow negative Z corrections (#13240)

pull/1/head
Bruce j Beare 6 years ago
committed by Scott Lahteine
parent
edf025ed8d
commit
562f2321d2
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/gcode/calibrate/G34_M422.cpp

4
Marlin/src/gcode/calibrate/G34_M422.cpp
View File

@ -88,7 +88,7 @@ void GcodeSuite::G34() {
} }
const float z_auto_align_amplification = parser.floatval('A', Z_STEPPER_ALIGN_AMP); const float z_auto_align_amplification = parser.floatval('A', Z_STEPPER_ALIGN_AMP);
if (!WITHIN(z_auto_align_amplification, 0.5f, 2.0f)) { if (!WITHIN(ABS(z_auto_align_amplification), 0.5f, 2.0f)) {
SERIAL_ECHOLNPGM("?(A)mplification out of bounds (0.5-2.0)."); SERIAL_ECHOLNPGM("?(A)mplification out of bounds (0.5-2.0).");
break; break;
} }
@ -137,7 +137,7 @@ void GcodeSuite::G34() {
// For each iteration go through all probe positions (one per Z-Stepper) // For each iteration go through all probe positions (one per Z-Stepper)
for (uint8_t zstepper = 0; zstepper < Z_STEPPER_COUNT; ++zstepper) { for (uint8_t zstepper = 0; zstepper < Z_STEPPER_COUNT; ++zstepper) {
// Probe a Z height for each stepper // Probe a Z height for each stepper
z_measured[zstepper] = probe_pt(z_auto_align_xpos[zstepper], z_auto_align_ypos[zstepper], PROBE_PT_RAISE, false); z_measured[zstepper] = probe_pt(z_auto_align_xpos[zstepper], z_auto_align_ypos[zstepper], PROBE_PT_RAISE, 0, false);
// Stop on error // Stop on error
if (isnan(z_measured[zstepper])) { if (isnan(z_measured[zstepper])) {

Write Preview
Loading…
Cancel
Save