3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5454 from thinkyhead/rc_fix_delta_g29

Browse Source 
Fix G29 starting height on DELTA
This commit is contained in:
Scott Lahteine 2016-12-10 22:10:33 -08:00 committed by GitHub
commit 2c97c11731
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Marlin_main.cpp
View File

@ -2177,6 +2177,11 @@ static void clean_up_after_endstop_or_probe_move() {
float old_feedrate_mm_s = feedrate_mm_s; float old_feedrate_mm_s = feedrate_mm_s;
#if ENABLED(DELTA)
if (current_position[Z_AXIS] > delta_clip_start_height)
do_blocking_move_to_z(delta_clip_start_height);
#endif
// Ensure a minimum height before moving the probe // Ensure a minimum height before moving the probe
do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES); do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);

7
Marlin/nozzle.h
View File

@ -70,8 +70,7 @@ class Nozzle {
#if ENABLED(NOZZLE_CLEAN_GOBACK) #if ENABLED(NOZZLE_CLEAN_GOBACK)
// Move the nozzle to the initial point // Move the nozzle to the initial point
do_blocking_move_to_z(initial.z); do_blocking_move_to(initial.x, initial.y, initial.z);
do_blocking_move_to_xy(initial.x, initial.y);
#endif // NOZZLE_CLEAN_GOBACK #endif // NOZZLE_CLEAN_GOBACK
#endif // NOZZLE_CLEAN_FEATURE #endif // NOZZLE_CLEAN_FEATURE
@ -149,6 +148,10 @@ class Nozzle {
__attribute__((unused)) uint8_t const &objects = 0 __attribute__((unused)) uint8_t const &objects = 0
) __attribute__((optimize ("Os"))) { ) __attribute__((optimize ("Os"))) {
#if ENABLED(NOZZLE_CLEAN_FEATURE) #if ENABLED(NOZZLE_CLEAN_FEATURE)
#if ENABLED(DELTA)
if (current_position[Z_AXIS] > delta_clip_start_height)
do_blocking_move_to_z(delta_clip_start_height);
#endif
switch (pattern) { switch (pattern) {
case 1: case 1:
Nozzle::zigzag( Nozzle::zigzag(