andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add DEBUGGING macro

pull/1/head
Scott Lahteine 9 years ago
parent
4402760739
commit
05765fb570
3 changed files with 70 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Marlin/Marlin.h
  2. 136
      Marlin/Marlin_main.cpp
  3. 2
      Marlin/planner.cpp

1
Marlin/Marlin.h
View File

@ -238,6 +238,7 @@ enum DebugFlags {
DEBUG_LEVELING = _BV(5) DEBUG_LEVELING = _BV(5)
}; };
extern uint8_t marlin_debug_flags; extern uint8_t marlin_debug_flags;
#define DEBUGGING(F) (marlin_debug_flags & (DEBUG_## F))
extern bool Running; extern bool Running;
inline bool IsRunning() { return Running; } inline bool IsRunning() { return Running; }

136
Marlin/Marlin_main.cpp
View File

@ -1238,7 +1238,7 @@ static void set_axis_is_at_home(AxisEnum axis) {
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("set_axis_is_at_home ", (unsigned long)axis); SERIAL_ECHOPAIR("set_axis_is_at_home ", (unsigned long)axis);
SERIAL_ECHOPAIR(" > (home_offset[axis]==", home_offset[axis]); SERIAL_ECHOPAIR(" > (home_offset[axis]==", home_offset[axis]);
print_xyz(") > current_position", current_position); print_xyz(") > current_position", current_position);
@ -1290,7 +1290,7 @@ static void setup_for_endstop_move() {
feedrate_multiplier = 100; feedrate_multiplier = 100;
refresh_cmd_timeout(); refresh_cmd_timeout();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("setup_for_endstop_move > enable_endstops(true)"); SERIAL_ECHOLNPGM("setup_for_endstop_move > enable_endstops(true)");
} }
#endif #endif
@ -1305,7 +1305,7 @@ static void setup_for_endstop_move() {
*/ */
void prepare_move_raw() { void prepare_move_raw() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("prepare_move_raw > destination", destination); print_xyz("prepare_move_raw > destination", destination);
} }
#endif #endif
@ -1337,7 +1337,7 @@ static void setup_for_endstop_move() {
current_position[Z_AXIS] = corrected_position.z; current_position[Z_AXIS] = corrected_position.z;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("set_bed_level_equation_lsq > current_position", current_position); print_xyz("set_bed_level_equation_lsq > current_position", current_position);
} }
#endif #endif
@ -1372,7 +1372,7 @@ static void setup_for_endstop_move() {
current_position[Z_AXIS] = corrected_position.z; current_position[Z_AXIS] = corrected_position.z;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("set_bed_level_equation_3pts > current_position", current_position); print_xyz("set_bed_level_equation_3pts > current_position", current_position);
} }
#endif #endif
@ -1396,7 +1396,7 @@ static void setup_for_endstop_move() {
long start_steps = st_get_position(Z_AXIS); long start_steps = st_get_position(Z_AXIS);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("run_z_probe (DELTA) 1"); SERIAL_ECHOLNPGM("run_z_probe (DELTA) 1");
} }
#endif #endif
@ -1417,7 +1417,7 @@ static void setup_for_endstop_move() {
current_position[Z_AXIS] = mm; current_position[Z_AXIS] = mm;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("run_z_probe (DELTA) 2 > current_position", current_position); print_xyz("run_z_probe (DELTA) 2 > current_position", current_position);
} }
#endif #endif
@ -1460,7 +1460,7 @@ static void setup_for_endstop_move() {
sync_plan_position(); sync_plan_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("run_z_probe > current_position", current_position); print_xyz("run_z_probe > current_position", current_position);
} }
#endif #endif
@ -1476,7 +1476,7 @@ static void setup_for_endstop_move() {
float oldFeedRate = feedrate; float oldFeedRate = feedrate;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("do_blocking_move_to", x, y, z); print_xyz("do_blocking_move_to", x, y, z);
} }
#endif #endif
@ -1529,7 +1529,7 @@ static void setup_for_endstop_move() {
static void clean_up_after_endstop_move() { static void clean_up_after_endstop_move() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("clean_up_after_endstop_move > ENDSTOPS_ONLY_FOR_HOMING > endstops_not_homing()"); SERIAL_ECHOLNPGM("clean_up_after_endstop_move > ENDSTOPS_ONLY_FOR_HOMING > endstops_not_homing()");
} }
#endif #endif
@ -1544,7 +1544,7 @@ static void setup_for_endstop_move() {
static void deploy_z_probe() { static void deploy_z_probe() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("deploy_z_probe > current_position", current_position); print_xyz("deploy_z_probe > current_position", current_position);
} }
#endif #endif
@ -1639,7 +1639,7 @@ static void setup_for_endstop_move() {
static void stow_z_probe(bool doRaise = true) { static void stow_z_probe(bool doRaise = true) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("stow_z_probe > current_position", current_position); print_xyz("stow_z_probe > current_position", current_position);
} }
#endif #endif
@ -1654,7 +1654,7 @@ static void setup_for_endstop_move() {
#if Z_RAISE_AFTER_PROBING > 0 #if Z_RAISE_AFTER_PROBING > 0
if (doRaise) { if (doRaise) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("Raise Z (after) by ", (float)Z_RAISE_AFTER_PROBING); SERIAL_ECHOPAIR("Raise Z (after) by ", (float)Z_RAISE_AFTER_PROBING);
SERIAL_EOL; SERIAL_EOL;
SERIAL_ECHO("> SERVO_ENDSTOPS > raise_z_after_probing()"); SERIAL_ECHO("> SERVO_ENDSTOPS > raise_z_after_probing()");
@ -1749,7 +1749,7 @@ static void setup_for_endstop_move() {
// Probe bed height at position (x,y), returns the measured z value // Probe bed height at position (x,y), returns the measured z value
static float probe_pt(float x, float y, float z_before, ProbeAction probe_action = ProbeDeployAndStow, int verbose_level = 1) { static float probe_pt(float x, float y, float z_before, ProbeAction probe_action = ProbeDeployAndStow, int verbose_level = 1) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("probe_pt >>>"); SERIAL_ECHOLNPGM("probe_pt >>>");
SERIAL_ECHOPAIR("> ProbeAction:", (unsigned long)probe_action); SERIAL_ECHOPAIR("> ProbeAction:", (unsigned long)probe_action);
SERIAL_EOL; SERIAL_EOL;
@ -1758,7 +1758,7 @@ static void setup_for_endstop_move() {
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("Z Raise to z_before ", z_before); SERIAL_ECHOPAIR("Z Raise to z_before ", z_before);
SERIAL_EOL; SERIAL_EOL;
SERIAL_ECHOPAIR("> do_blocking_move_to_z ", z_before); SERIAL_ECHOPAIR("> do_blocking_move_to_z ", z_before);
@ -1770,7 +1770,7 @@ static void setup_for_endstop_move() {
do_blocking_move_to_z(z_before); // this also updates current_position do_blocking_move_to_z(z_before); // this also updates current_position
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> do_blocking_move_to_xy ", x - (X_PROBE_OFFSET_FROM_EXTRUDER)); SERIAL_ECHOPAIR("> do_blocking_move_to_xy ", x - (X_PROBE_OFFSET_FROM_EXTRUDER));
SERIAL_ECHOPAIR(", ", y - (Y_PROBE_OFFSET_FROM_EXTRUDER)); SERIAL_ECHOPAIR(", ", y - (Y_PROBE_OFFSET_FROM_EXTRUDER));
SERIAL_EOL; SERIAL_EOL;
@ -1783,7 +1783,7 @@ static void setup_for_endstop_move() {
#if DISABLED(Z_PROBE_SLED) && DISABLED(Z_PROBE_ALLEN_KEY) #if DISABLED(Z_PROBE_SLED) && DISABLED(Z_PROBE_ALLEN_KEY)
if (probe_action & ProbeDeploy) { if (probe_action & ProbeDeploy) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> ProbeDeploy"); SERIAL_ECHOLNPGM("> ProbeDeploy");
} }
#endif #endif
@ -1797,7 +1797,7 @@ static void setup_for_endstop_move() {
#if DISABLED(Z_PROBE_SLED) && DISABLED(Z_PROBE_ALLEN_KEY) #if DISABLED(Z_PROBE_SLED) && DISABLED(Z_PROBE_ALLEN_KEY)
if (probe_action & ProbeStow) { if (probe_action & ProbeStow) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> ProbeStow (stow_z_probe will do Z Raise)"); SERIAL_ECHOLNPGM("> ProbeStow (stow_z_probe will do Z Raise)");
} }
#endif #endif
@ -1816,7 +1816,7 @@ static void setup_for_endstop_move() {
} }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("<<< probe_pt"); SERIAL_ECHOLNPGM("<<< probe_pt");
} }
#endif #endif
@ -1883,7 +1883,7 @@ static void setup_for_endstop_move() {
*/ */
void reset_bed_level() { void reset_bed_level() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("reset_bed_level"); SERIAL_ECHOLNPGM("reset_bed_level");
} }
#endif #endif
@ -1932,7 +1932,7 @@ static void axis_unhomed_error() {
*/ */
static void dock_sled(bool dock, int offset = 0) { static void dock_sled(bool dock, int offset = 0) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("dock_sled", dock); SERIAL_ECHOPAIR("dock_sled", dock);
SERIAL_EOL; SERIAL_EOL;
} }
@ -1977,7 +1977,7 @@ static void axis_unhomed_error() {
static void homeaxis(AxisEnum axis) { static void homeaxis(AxisEnum axis) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR(">>> homeaxis(", (unsigned long)axis); SERIAL_ECHOPAIR(">>> homeaxis(", (unsigned long)axis);
SERIAL_CHAR(')'); SERIAL_CHAR(')');
SERIAL_EOL; SERIAL_EOL;
@ -2036,7 +2036,7 @@ static void homeaxis(AxisEnum axis) {
sync_plan_position(); sync_plan_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> enable_endstops(false)"); SERIAL_ECHOLNPGM("> enable_endstops(false)");
} }
#endif #endif
@ -2048,7 +2048,7 @@ static void homeaxis(AxisEnum axis) {
st_synchronize(); st_synchronize();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> enable_endstops(true)"); SERIAL_ECHOLNPGM("> enable_endstops(true)");
} }
#endif #endif
@ -2063,7 +2063,7 @@ static void homeaxis(AxisEnum axis) {
st_synchronize(); st_synchronize();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> TRIGGER ENDSTOP > current_position", current_position); print_xyz("> TRIGGER ENDSTOP > current_position", current_position);
} }
#endif #endif
@ -2097,7 +2097,7 @@ static void homeaxis(AxisEnum axis) {
// retrace by the amount specified in endstop_adj // retrace by the amount specified in endstop_adj
if (endstop_adj[axis] * axis_home_dir < 0) { if (endstop_adj[axis] * axis_home_dir < 0) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> enable_endstops(false)"); SERIAL_ECHOLNPGM("> enable_endstops(false)");
} }
#endif #endif
@ -2105,7 +2105,7 @@ static void homeaxis(AxisEnum axis) {
sync_plan_position(); sync_plan_position();
destination[axis] = endstop_adj[axis]; destination[axis] = endstop_adj[axis];
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> endstop_adj = ", endstop_adj[axis]); SERIAL_ECHOPAIR("> endstop_adj = ", endstop_adj[axis]);
print_xyz(" > destination", destination); print_xyz(" > destination", destination);
} }
@ -2113,7 +2113,7 @@ static void homeaxis(AxisEnum axis) {
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> enable_endstops(true)"); SERIAL_ECHOLNPGM("> enable_endstops(true)");
} }
#endif #endif
@ -2121,7 +2121,7 @@ static void homeaxis(AxisEnum axis) {
} }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
else { else {
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> endstop_adj * axis_home_dir = ", endstop_adj[axis] * axis_home_dir); SERIAL_ECHOPAIR("> endstop_adj * axis_home_dir = ", endstop_adj[axis] * axis_home_dir);
SERIAL_EOL; SERIAL_EOL;
} }
@ -2134,7 +2134,7 @@ static void homeaxis(AxisEnum axis) {
sync_plan_position(); sync_plan_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> AFTER set_axis_is_at_home > current_position", current_position); print_xyz("> AFTER set_axis_is_at_home > current_position", current_position);
} }
#endif #endif
@ -2156,7 +2156,7 @@ static void homeaxis(AxisEnum axis) {
if (axis == Z_AXIS) { if (axis == Z_AXIS) {
if (axis_home_dir < 0) { if (axis_home_dir < 0) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> SERVO_LEVELING > stow_z_probe"); SERIAL_ECHOLNPGM("> SERVO_LEVELING > stow_z_probe");
} }
#endif #endif
@ -2172,7 +2172,7 @@ static void homeaxis(AxisEnum axis) {
// Retract Servo endstop if enabled // Retract Servo endstop if enabled
if (servo_endstop_id[axis] >= 0) { if (servo_endstop_id[axis] >= 0) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> SERVO_ENDSTOPS > Stow with servo.move()"); SERIAL_ECHOLNPGM("> SERVO_ENDSTOPS > Stow with servo.move()");
} }
#endif #endif
@ -2185,7 +2185,7 @@ static void homeaxis(AxisEnum axis) {
} }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("<<< homeaxis(", (unsigned long)axis); SERIAL_ECHOPAIR("<<< homeaxis(", (unsigned long)axis);
SERIAL_CHAR(')'); SERIAL_CHAR(')');
SERIAL_EOL; SERIAL_EOL;
@ -2424,7 +2424,7 @@ inline void gcode_G4() {
inline void gcode_G28() { inline void gcode_G28() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("gcode_G28 >>>"); SERIAL_ECHOLNPGM("gcode_G28 >>>");
} }
#endif #endif
@ -2487,7 +2487,7 @@ inline void gcode_G28() {
sync_plan_position_delta(); sync_plan_position_delta();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("(DELTA) > current_position", current_position); print_xyz("(DELTA) > current_position", current_position);
} }
#endif #endif
@ -2505,7 +2505,7 @@ inline void gcode_G28() {
if (home_all_axis || homeZ) { if (home_all_axis || homeZ) {
HOMEAXIS(Z); HOMEAXIS(Z);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> HOMEAXIS(Z) > current_position", current_position); print_xyz("> HOMEAXIS(Z) > current_position", current_position);
} }
#endif #endif
@ -2518,7 +2518,7 @@ inline void gcode_G28() {
destination[Z_AXIS] = MIN_Z_HEIGHT_FOR_HOMING; destination[Z_AXIS] = MIN_Z_HEIGHT_FOR_HOMING;
feedrate = max_feedrate[Z_AXIS] * 60; // feedrate (mm/m) = max_feedrate (mm/s) feedrate = max_feedrate[Z_AXIS] * 60; // feedrate (mm/m) = max_feedrate (mm/s)
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("Raise Z (before homing) to ", (float)(MIN_Z_HEIGHT_FOR_HOMING)); SERIAL_ECHOPAIR("Raise Z (before homing) to ", (float)(MIN_Z_HEIGHT_FOR_HOMING));
SERIAL_EOL; SERIAL_EOL;
print_xyz("> (home_all_axis || homeZ) > current_position", current_position); print_xyz("> (home_all_axis || homeZ) > current_position", current_position);
@ -2566,7 +2566,7 @@ inline void gcode_G28() {
sync_plan_position(); sync_plan_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> QUICK_HOME > current_position 1", current_position); print_xyz("> QUICK_HOME > current_position 1", current_position);
} }
#endif #endif
@ -2585,7 +2585,7 @@ inline void gcode_G28() {
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> QUICK_HOME > current_position 2", current_position); print_xyz("> QUICK_HOME > current_position 2", current_position);
} }
#endif #endif
@ -2616,7 +2616,7 @@ inline void gcode_G28() {
HOMEAXIS(X); HOMEAXIS(X);
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> homeX", current_position); print_xyz("> homeX", current_position);
} }
#endif #endif
@ -2627,7 +2627,7 @@ inline void gcode_G28() {
if (home_all_axis || homeY) { if (home_all_axis || homeY) {
HOMEAXIS(Y); HOMEAXIS(Y);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> homeY", current_position); print_xyz("> homeY", current_position);
} }
#endif #endif
@ -2642,7 +2642,7 @@ inline void gcode_G28() {
#if ENABLED(Z_SAFE_HOMING) #if ENABLED(Z_SAFE_HOMING)
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> Z_SAFE_HOMING >>>"); SERIAL_ECHOLNPGM("> Z_SAFE_HOMING >>>");
} }
#endif #endif
@ -2667,7 +2667,7 @@ inline void gcode_G28() {
feedrate = XY_TRAVEL_SPEED; feedrate = XY_TRAVEL_SPEED;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> Z_SAFE_HOMING > home_all_axis > current_position", current_position); print_xyz("> Z_SAFE_HOMING > home_all_axis > current_position", current_position);
print_xyz("> Z_SAFE_HOMING > home_all_axis > destination", destination); print_xyz("> Z_SAFE_HOMING > home_all_axis > destination", destination);
} }
@ -2720,7 +2720,7 @@ inline void gcode_G28() {
} // !home_all_axes && homeZ } // !home_all_axes && homeZ
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("<<< Z_SAFE_HOMING"); SERIAL_ECHOLNPGM("<<< Z_SAFE_HOMING");
} }
#endif #endif
@ -2732,7 +2732,7 @@ inline void gcode_G28() {
#endif // !Z_SAFE_HOMING #endif // !Z_SAFE_HOMING
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> (home_all_axis || homeZ) > final", current_position); print_xyz("> (home_all_axis || homeZ) > final", current_position);
} }
#endif #endif
@ -2751,7 +2751,7 @@ inline void gcode_G28() {
#if ENABLED(ENDSTOPS_ONLY_FOR_HOMING) #if ENABLED(ENDSTOPS_ONLY_FOR_HOMING)
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("ENDSTOPS_ONLY_FOR_HOMING enable_endstops(false)"); SERIAL_ECHOLNPGM("ENDSTOPS_ONLY_FOR_HOMING enable_endstops(false)");
} }
#endif #endif
@ -2770,7 +2770,7 @@ inline void gcode_G28() {
line_to_destination(); line_to_destination();
st_synchronize(); st_synchronize();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("mbl_was_active > current_position", current_position); print_xyz("mbl_was_active > current_position", current_position);
} }
#endif #endif
@ -2783,7 +2783,7 @@ inline void gcode_G28() {
endstops_hit_on_purpose(); // clear endstop hit flags endstops_hit_on_purpose(); // clear endstop hit flags
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("<<< gcode_G28"); SERIAL_ECHOLNPGM("<<< gcode_G28");
} }
#endif #endif
@ -2993,7 +2993,7 @@ inline void gcode_G28() {
inline void gcode_G29() { inline void gcode_G29() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("gcode_G29 >>>"); SERIAL_ECHOLNPGM("gcode_G29 >>>");
} }
#endif #endif
@ -3160,7 +3160,7 @@ inline void gcode_G28() {
if (probePointCounter) { if (probePointCounter) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("z_before = (between) ", (float)(Z_RAISE_BETWEEN_PROBINGS + current_position[Z_AXIS])); SERIAL_ECHOPAIR("z_before = (between) ", (float)(Z_RAISE_BETWEEN_PROBINGS + current_position[Z_AXIS]));
SERIAL_EOL; SERIAL_EOL;
} }
@ -3168,7 +3168,7 @@ inline void gcode_G28() {
} }
else { else {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("z_before = (before) ", (float)Z_RAISE_BEFORE_PROBING); SERIAL_ECHOPAIR("z_before = (before) ", (float)Z_RAISE_BEFORE_PROBING);
SERIAL_EOL; SERIAL_EOL;
} }
@ -3213,7 +3213,7 @@ inline void gcode_G28() {
} //yProbe } //yProbe
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> probing complete > current_position", current_position); print_xyz("> probing complete > current_position", current_position);
} }
#endif #endif
@ -3319,7 +3319,7 @@ inline void gcode_G28() {
#else // !AUTO_BED_LEVELING_GRID #else // !AUTO_BED_LEVELING_GRID
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("> 3-point Leveling"); SERIAL_ECHOLNPGM("> 3-point Leveling");
} }
#endif #endif
@ -3363,7 +3363,7 @@ inline void gcode_G28() {
real_z = st_get_axis_position_mm(Z_AXIS); //get the real Z (since plan_get_position is now correcting the plane) real_z = st_get_axis_position_mm(Z_AXIS); //get the real Z (since plan_get_position is now correcting the plane)
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> BEFORE apply_rotation_xyz > z_tmp = ", z_tmp); SERIAL_ECHOPAIR("> BEFORE apply_rotation_xyz > z_tmp = ", z_tmp);
SERIAL_EOL; SERIAL_EOL;
SERIAL_ECHOPAIR("> BEFORE apply_rotation_xyz > real_z = ", real_z); SERIAL_ECHOPAIR("> BEFORE apply_rotation_xyz > real_z = ", real_z);
@ -3397,7 +3397,7 @@ inline void gcode_G28() {
* here, it could be seen as a compensating factor for the Z probe. * here, it could be seen as a compensating factor for the Z probe.
*/ */
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> AFTER apply_rotation_xyz > z_tmp = ", z_tmp); SERIAL_ECHOPAIR("> AFTER apply_rotation_xyz > z_tmp = ", z_tmp);
SERIAL_EOL; SERIAL_EOL;
} }
@ -3412,7 +3412,7 @@ inline void gcode_G28() {
sync_plan_position(); sync_plan_position();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
print_xyz("> corrected Z in G29", current_position); print_xyz("> corrected Z in G29", current_position);
} }
#endif #endif
@ -3432,7 +3432,7 @@ inline void gcode_G28() {
#ifdef Z_PROBE_END_SCRIPT #ifdef Z_PROBE_END_SCRIPT
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHO("Z Probe End Script: "); SERIAL_ECHO("Z Probe End Script: ");
SERIAL_ECHOLNPGM(Z_PROBE_END_SCRIPT); SERIAL_ECHOLNPGM(Z_PROBE_END_SCRIPT);
} }
@ -3447,7 +3447,7 @@ inline void gcode_G28() {
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("<<< gcode_G29"); SERIAL_ECHOLNPGM("<<< gcode_G29");
} }
#endif #endif
@ -4084,7 +4084,7 @@ inline void gcode_M42() {
*/ */
inline void gcode_M104() { inline void gcode_M104() {
if (setTargetedHotend(104)) return; if (setTargetedHotend(104)) return;
if (marlin_debug_flags & DEBUG_DRYRUN) return; if (DEBUGGING(DRYRUN)) return;
if (code_seen('S')) { if (code_seen('S')) {
float temp = code_value(); float temp = code_value();
@ -4224,7 +4224,7 @@ inline void gcode_M109() {
print_job_start(); print_job_start();
if (setTargetedHotend(109)) return; if (setTargetedHotend(109)) return;
if (marlin_debug_flags & DEBUG_DRYRUN) return; if (DEBUGGING(DRYRUN)) return;
no_wait_for_cooling = code_seen('S'); no_wait_for_cooling = code_seen('S');
if (no_wait_for_cooling || code_seen('R')) { if (no_wait_for_cooling || code_seen('R')) {
@ -4308,7 +4308,7 @@ inline void gcode_M109() {
* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling * Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
*/ */
inline void gcode_M190() { inline void gcode_M190() {
if (marlin_debug_flags & DEBUG_DRYRUN) return; if (DEBUGGING(DRYRUN)) return;
LCD_MESSAGEPGM(MSG_BED_HEATING); LCD_MESSAGEPGM(MSG_BED_HEATING);
bool no_wait_for_cooling = code_seen('S'); bool no_wait_for_cooling = code_seen('S');
@ -4416,7 +4416,7 @@ inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
* M140: Set bed temperature * M140: Set bed temperature
*/ */
inline void gcode_M140() { inline void gcode_M140() {
if (marlin_debug_flags & DEBUG_DRYRUN) return; if (DEBUGGING(DRYRUN)) return;
if (code_seen('S')) setTargetBed(code_value()); if (code_seen('S')) setTargetBed(code_value());
} }
@ -4900,7 +4900,7 @@ inline void gcode_M206() {
*/ */
inline void gcode_M666() { inline void gcode_M666() {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM(">>> gcode_M666"); SERIAL_ECHOLNPGM(">>> gcode_M666");
} }
#endif #endif
@ -4908,7 +4908,7 @@ inline void gcode_M206() {
if (code_seen(axis_codes[i])) { if (code_seen(axis_codes[i])) {
endstop_adj[i] = code_value(); endstop_adj[i] = code_value();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPGM("endstop_adj["); SERIAL_ECHOPGM("endstop_adj[");
SERIAL_ECHO(axis_codes[i]); SERIAL_ECHO(axis_codes[i]);
SERIAL_ECHOPAIR("] = ", endstop_adj[i]); SERIAL_ECHOPAIR("] = ", endstop_adj[i]);
@ -4918,7 +4918,7 @@ inline void gcode_M206() {
} }
} }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOLNPGM("<<< gcode_M666"); SERIAL_ECHOLNPGM("<<< gcode_M666");
} }
#endif #endif
@ -6081,7 +6081,7 @@ inline void gcode_T(uint8_t tmp_extruder) {
void process_next_command() { void process_next_command() {
current_command = command_queue[cmd_queue_index_r]; current_command = command_queue[cmd_queue_index_r];
if ((marlin_debug_flags & DEBUG_ECHO)) { if (DEBUGGING(ECHO)) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLN(current_command); SERIAL_ECHOLN(current_command);
} }
@ -6709,7 +6709,7 @@ void clamp_to_software_endstops(float target[3]) {
if (zprobe_zoffset < 0) negative_z_offset += zprobe_zoffset; if (zprobe_zoffset < 0) negative_z_offset += zprobe_zoffset;
if (home_offset[Z_AXIS] < 0) { if (home_offset[Z_AXIS] < 0) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (marlin_debug_flags & DEBUG_LEVELING) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("> clamp_to_software_endstops > Add home_offset[Z_AXIS]:", home_offset[Z_AXIS]); SERIAL_ECHOPAIR("> clamp_to_software_endstops > Add home_offset[Z_AXIS]:", home_offset[Z_AXIS]);
SERIAL_EOL; SERIAL_EOL;
} }
@ -6889,7 +6889,7 @@ void mesh_plan_buffer_line(float x, float y, float z, const float e, float feed_
#if ENABLED(PREVENT_DANGEROUS_EXTRUDE) #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
inline void prevent_dangerous_extrude(float& curr_e, float& dest_e) { inline void prevent_dangerous_extrude(float& curr_e, float& dest_e) {
if (marlin_debug_flags & DEBUG_DRYRUN) return; if (DEBUGGING(DRYRUN)) return;
float de = dest_e - curr_e; float de = dest_e - curr_e;
if (de) { if (de) {
if (degHotend(active_extruder) < extrude_min_temp) { if (degHotend(active_extruder) < extrude_min_temp) {

2
Marlin/planner.cpp
View File

@ -591,7 +591,7 @@ float junction_deviation = 0.1;
dz = target[Z_AXIS] - position[Z_AXIS]; dz = target[Z_AXIS] - position[Z_AXIS];
// DRYRUN ignores all temperature constraints and assures that the extruder is instantly satisfied // DRYRUN ignores all temperature constraints and assures that the extruder is instantly satisfied
if (marlin_debug_flags & DEBUG_DRYRUN) if (DEBUGGING(DRYRUN))
position[E_AXIS] = target[E_AXIS]; position[E_AXIS] = target[E_AXIS];
long de = target[E_AXIS] - position[E_AXIS]; long de = target[E_AXIS] - position[E_AXIS];

Write Preview
Loading…
Cancel
Save