bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Additional logging of do_blocking_move_to

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-22 23:52:42 -07:00
parent 0b2c608d2f
commit ad16d5019e
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Marlin/Marlin_main.cpp
View File

@ -1672,7 +1672,7 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) {
float old_feedrate_mm_m = feedrate_mm_m; float old_feedrate_mm_m = feedrate_mm_m;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) print_xyz(PSTR("do_blocking_move_to"), NULL, x, y, z); if (DEBUGGING(LEVELING)) print_xyz(PSTR(">>> do_blocking_move_to"), NULL, x, y, z);
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
@ -1681,6 +1681,10 @@ 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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("set_destination_to_current"), destination);
#endif
// when in the danger zone // when in the danger zone
if (current_position[Z_AXIS] > delta_clip_start_height) { if (current_position[Z_AXIS] > delta_clip_start_height) {
if (z > delta_clip_start_height) { // staying in the danger zone if (z > delta_clip_start_height) { // staying in the danger zone
@ -1688,28 +1692,47 @@ 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;
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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("danger zone move"), current_position);
#endif
return; return;
} }
else { else {
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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("zone border move"), current_position);
#endif
} }
} }
if (z > current_position[Z_AXIS]) { // raising? if (z > current_position[Z_AXIS]) { // raising?
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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("z raise move"), current_position);
#endif
} }
destination[X_AXIS] = x; destination[X_AXIS] = x;
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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("xy move"), current_position);
#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 (DEBUGGING(LEVELING)) DEBUG_POS(PSTR("z lower move"), current_position);
#endif
} }
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< do_blocking_move_to");
#endif
#else #else
// If Z needs to raise, do it before moving XY // If Z needs to raise, do it before moving XY