josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2395 from wavexx/always_raise_at_zmin 

Improve raise_z_above to always raise when at Z_MIN
This commit is contained in:
DRracer 2020-01-08 14:30:48 +01:00 committed by GitHub
parent 955c88cf68 853991865c
commit 4936e01d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View File

@ -2125,9 +2125,15 @@ void raise_z_above(float target, bool plan)
// Z needs raising // Z needs raising
current_position[Z_AXIS] = target; current_position[Z_AXIS] = target;
if (axis_known_position[Z_AXIS]) #if defined(Z_MIN_PIN) && (Z_MIN_PIN > -1) && !defined(DEBUG_DISABLE_ZMINLIMIT)
bool z_min_endstop = (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
#else
bool z_min_endstop = false;
#endif
if (axis_known_position[Z_AXIS] || z_min_endstop)
{ {
// current position is known, it's safe to raise Z // current position is known or very low, it's safe to raise Z
if(plan) plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder); if(plan) plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder);
return; return;
} }