0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🎨 Cosmetic cleanup 23-01

Browse source
This commit is contained in:
Scott Lahteine 2024-01-23 16:05:41 -06:00
parent 5fea79fd07
commit 3ef192e7c7
3 changed files with 51 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/lcd/marlinui.cpp
View file

@ -847,7 +847,7 @@ void MarlinUI::init() {
if (processing) return; // Prevent re-entry from idle() calls if (processing) return; // Prevent re-entry from idle() calls
// Add a manual move to the queue? // Add a manual move to the queue?
if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) { if (axis == NO_AXIS_ENUM || PENDING(millis(), start_time) || planner.is_full()) return;
const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S; const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
@ -893,7 +893,6 @@ void MarlinUI::init() {
#endif #endif
} }
}
// //
// Tell ui.update() to start a move to current_position after a short delay. // Tell ui.update() to start a move to current_position after a short delay.

3
Marlin/src/module/motion.cpp
View file

@ -1318,8 +1318,9 @@ float get_move_distance(const xyze_pos_t &diff OPTARG(HAS_ROTATIONAL_AXES, bool
float cartesian_mm = get_move_distance(diff OPTARG(HAS_ROTATIONAL_AXES, cartes_move)); float cartesian_mm = get_move_distance(diff OPTARG(HAS_ROTATIONAL_AXES, cartes_move));
// If the move is very short, check the E move distance // If the move is very short, check the E move distance
// No E move either? Game over.
TERN_(HAS_EXTRUDERS, if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e)); TERN_(HAS_EXTRUDERS, if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e));
// No E move either? Game over.
if (UNEAR_ZERO(cartesian_mm)) return; if (UNEAR_ZERO(cartesian_mm)) return;
// The length divided by the segment size // The length divided by the segment size

16
Marlin/src/module/stepper.cpp
View file

@ -2600,17 +2600,13 @@ hal_timer_t Stepper::block_phase_isr() {
if (X_MOVE_TEST) didmove.a = true, if (X_MOVE_TEST) didmove.a = true,
if (Y_MOVE_TEST) didmove.b = true, if (Y_MOVE_TEST) didmove.b = true,
if (Z_MOVE_TEST) didmove.c = true, if (Z_MOVE_TEST) didmove.c = true,
if (current_block->steps.i) didmove.i = true, if (!!current_block->steps.i) didmove.i = true,
if (current_block->steps.j) didmove.j = true, if (!!current_block->steps.j) didmove.j = true,
if (current_block->steps.k) didmove.k = true, if (!!current_block->steps.k) didmove.k = true,
if (current_block->steps.u) didmove.u = true, if (!!current_block->steps.u) didmove.u = true,
if (current_block->steps.v) didmove.v = true, if (!!current_block->steps.v) didmove.v = true,
if (current_block->steps.w) didmove.w = true if (!!current_block->steps.w) didmove.w = true
); );
//if (current_block->steps.e) didmove.e = true;
//if (current_block->steps.a) didmove.x = true;
//if (current_block->steps.b) didmove.y = true;
//if (current_block->steps.c) didmove.z = true;
axis_did_move = didmove; axis_did_move = didmove;
// No acceleration / deceleration time elapsed so far // No acceleration / deceleration time elapsed so far