forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4323 from jbrazio/followup-4320

Browse Source 
Followup for #4320
master
João Brázio 8 years ago committed by GitHub
parent d7c51bc4b9 5f368d1bc3
commit 7202383695
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File

10
Marlin/Marlin_main.cpp
Unescape View File

@ -1706,10 +1706,6 @@ inline void do_blocking_move_to_z(float z, float feed_rate = 0.0) {
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, feed_rate); do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, feed_rate);
} }
inline void do_blocking_move_to_xy(float x, float y, float feed_rate = 0.0) {
do_blocking_move_to(x, y, current_position[Z_AXIS], feed_rate);
}
// //
// Prepare to do endstop or probe moves // Prepare to do endstop or probe moves
// with custom feedrates. // with custom feedrates.
@ -1760,7 +1756,8 @@ static void clean_up_after_endstop_or_probe_move() {
#endif //HAS_BED_PROBE #endif //HAS_BED_PROBE
static bool axis_unhomed_error(const bool x, const bool y, const bool z) { #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE)
static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
const bool xx = x && !axis_homed[X_AXIS], const bool xx = x && !axis_homed[X_AXIS],
yy = y && !axis_homed[Y_AXIS], yy = y && !axis_homed[Y_AXIS],
zz = z && !axis_homed[Z_AXIS]; zz = z && !axis_homed[Z_AXIS];
@ -1784,7 +1781,8 @@ static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
return true; return true;
} }
return false; return false;
} }
#endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)

Write Preview
Loading…
Cancel
Save