3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4380 from esenapaj/Fix-the-PR-#4379

Browse Source 
Fix for the PR #4379 (Additional logging of do_blocking_move_to)
This commit is contained in:
Scott Lahteine 2016-07-23 00:43:01 -07:00 committed by GitHub
commit 13387ac302
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -1677,7 +1677,7 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
set_destination_to_current(); // sync destination at the start set_destination_to_current(); // sync destination at the start
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("set_destination_to_current"), destination); if (DEBUGGING(LEVELING)) DEBUG_POS("set_destination_to_current", destination);
#endif #endif
// when in the danger zone // when in the danger zone
@ -1688,7 +1688,7 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
destination[Z_AXIS] = z; destination[Z_AXIS] = z;
prepare_move_to_destination_raw(); // set_current_to_destination prepare_move_to_destination_raw(); // set_current_to_destination
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("danger zone move"), current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("danger zone move", current_position);
#endif #endif
return; return;
} }
@ -1696,7 +1696,7 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
destination[Z_AXIS] = delta_clip_start_height; destination[Z_AXIS] = delta_clip_start_height;
prepare_move_to_destination_raw(); // set_current_to_destination prepare_move_to_destination_raw(); // set_current_to_destination
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("zone border move"), current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
#endif #endif
} }
} }
@ -1705,7 +1705,7 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
destination[Z_AXIS] = z; destination[Z_AXIS] = z;
prepare_move_to_destination_raw(); // set_current_to_destination prepare_move_to_destination_raw(); // set_current_to_destination
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("z raise move"), current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("z raise move", current_position);
#endif #endif
} }
@ -1713,14 +1713,14 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
destination[Y_AXIS] = y; destination[Y_AXIS] = y;
prepare_move_to_destination(); // set_current_to_destination prepare_move_to_destination(); // set_current_to_destination
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("xy move"), current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("xy move", current_position);
#endif #endif
if (z < current_position[Z_AXIS]) { // lowering? if (z < current_position[Z_AXIS]) { // lowering?
destination[Z_AXIS] = z; destination[Z_AXIS] = z;
prepare_move_to_destination_raw(); // set_current_to_destination prepare_move_to_destination_raw(); // set_current_to_destination
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("z lower move"), current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("z lower move", current_position);
#endif #endif
} }