Skip to content

Commit 185961f

Browse files
committed
πŸ§‘β€πŸ’» More debug in motion.*
1 parent e9f483b commit 185961f

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

β€ŽMarlin/src/module/motion.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
811811
static float saved_feedrate_mm_s;
812812
static int16_t saved_feedrate_percentage;
813813
void remember_feedrate_and_scaling() {
814+
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("remember_feedrate_and_scaling: fr=", feedrate_mm_s, " ", feedrate_percentage, "%");
814815
saved_feedrate_mm_s = feedrate_mm_s;
815816
saved_feedrate_percentage = feedrate_percentage;
816817
}
@@ -821,6 +822,7 @@ void remember_feedrate_scaling_off() {
821822
void restore_feedrate_and_scaling() {
822823
feedrate_mm_s = saved_feedrate_mm_s;
823824
feedrate_percentage = saved_feedrate_percentage;
825+
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("restore_feedrate_and_scaling: fr=", feedrate_mm_s, " ", feedrate_percentage, "%");
824826
}
825827

826828
#if HAS_SOFTWARE_ENDSTOPS

β€ŽMarlin/src/module/motion.h

+7-12
Original file line numberDiff line numberDiff line change
@@ -436,26 +436,21 @@ void set_axis_is_at_home(const AxisEnum axis);
436436
void set_axis_never_homed(const AxisEnum axis);
437437
main_axes_bits_t axes_should_home(main_axes_bits_t axes_mask=main_axes_mask);
438438
bool homing_needed_error(main_axes_bits_t axes_mask=main_axes_mask);
439-
inline void set_axis_unhomed(const AxisEnum axis) { CBI(axes_homed, axis); }
440-
inline void set_axis_untrusted(const AxisEnum axis) { CBI(axes_trusted, axis); }
441-
inline void set_all_unhomed() { axes_homed = axes_trusted = 0; }
442-
inline void set_axis_homed(const AxisEnum axis) { SBI(axes_homed, axis); }
443-
inline void set_axis_trusted(const AxisEnum axis) { SBI(axes_trusted, axis); }
444-
inline void set_all_homed() { axes_homed = axes_trusted = main_axes_mask; }
445439
#else
446440
constexpr main_axes_bits_t axes_homed = main_axes_mask, axes_trusted = main_axes_mask; // Zero-endstop machines are always homed and trusted
447441
inline void homeaxis(const AxisEnum axis) {}
448442
inline void set_axis_never_homed(const AxisEnum) {}
449443
inline main_axes_bits_t axes_should_home(main_axes_bits_t=main_axes_mask) { return 0; }
450444
inline bool homing_needed_error(main_axes_bits_t=main_axes_mask) { return false; }
451-
inline void set_axis_unhomed(const AxisEnum axis) {}
452-
inline void set_axis_untrusted(const AxisEnum axis) {}
453-
inline void set_all_unhomed() {}
454-
inline void set_axis_homed(const AxisEnum axis) {}
455-
inline void set_axis_trusted(const AxisEnum axis) {}
456-
inline void set_all_homed() {}
457445
#endif
458446

447+
inline void set_axis_unhomed(const AxisEnum axis) { TERN_(HAS_ENDSTOPS, CBI(axes_homed, axis)); }
448+
inline void set_axis_untrusted(const AxisEnum axis) { TERN_(HAS_ENDSTOPS, CBI(axes_trusted, axis)); }
449+
inline void set_all_unhomed() { TERN_(HAS_ENDSTOPS, axes_homed = axes_trusted = 0); }
450+
inline void set_axis_homed(const AxisEnum axis) { TERN_(HAS_ENDSTOPS, SBI(axes_homed, axis)); }
451+
inline void set_axis_trusted(const AxisEnum axis) { TERN_(HAS_ENDSTOPS, SBI(axes_trusted, axis)); }
452+
inline void set_all_homed() { TERN_(HAS_ENDSTOPS, axes_homed = axes_trusted = main_axes_mask); }
453+
459454
inline bool axis_was_homed(const AxisEnum axis) { return TEST(axes_homed, axis); }
460455
inline bool axis_is_trusted(const AxisEnum axis) { return TEST(axes_trusted, axis); }
461456
inline bool axis_should_home(const AxisEnum axis) { return (axes_should_home() & _BV(axis)) != 0; }

0 commit comments

Comments
Β (0)