3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-12-29 02:40:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🩹 Quieter FTM build

Browse source
This commit is contained in:
Scott Lahteine 2025-11-07 01:43:22 -06:00
parent 2073b67e45
commit d1f2b2d27b
6 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -314,7 +314,7 @@ void unified_bed_leveling::G29() {
const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
// Potentially disable Fixed-Time Motion for probing
TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
TERN_(FT_MOTION, FTM_DISABLE_IN_SCOPE());
// Check for commands that require the printer to be homed
if (may_move) {

2
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View file

@ -68,7 +68,7 @@ inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM("
void GcodeSuite::G29() {
// Potentially disable Fixed-Time Motion for probing
TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
TERN_(FT_MOTION, FTM_DISABLE_IN_SCOPE());
DEBUG_SECTION(log_G29, "G29", true);

4
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -131,7 +131,7 @@
inline void home_z_safely() {
// Potentially disable Fixed-Time Motion for homing
TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
TERN_(FT_MOTION, FTM_DISABLE_IN_SCOPE());
DEBUG_SECTION(log_G28, "home_z_safely", DEBUGGING(LEVELING));
@ -290,7 +290,7 @@ void GcodeSuite::G28() {
#endif
// Potentially disable Fixed-Time Motion for homing
TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
TERN_(FT_MOTION, FTM_DISABLE_IN_SCOPE());
// Always home with tool 0 active
#if HAS_MULTI_HOTEND

2
Marlin/src/gcode/probe/G30.cpp
View file

@ -81,7 +81,7 @@ void GcodeSuite::G30() {
TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true)));
// Potentially disable Fixed-Time Motion for probing
TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
TERN_(FT_MOTION, FTM_DISABLE_IN_SCOPE());
// Probe the bed, optionally raise, and return the measured height
const float measured_z = probe.probe_at_point(probepos, raise_after);

10
Marlin/src/module/ft_motion.h
View file

@ -258,8 +258,8 @@ extern FTMotion ftMotion; // Use ftMotion.thing, not FTMotion::thing.
* Optional behavior to turn FT Motion off for homing/probing.
* Applies when FTM_HOME_AND_PROBE is disabled.
*/
typedef struct FTMotionDisableInScope {
#if DISABLED(FTM_HOME_AND_PROBE)
#if DISABLED(FTM_HOME_AND_PROBE)
typedef struct FTMotionDisableInScope {
bool isactive;
FTMotionDisableInScope() {
isactive = ftMotion.cfg.active;
@ -269,5 +269,7 @@ typedef struct FTMotionDisableInScope {
ftMotion.cfg.active = isactive;
if (isactive) ftMotion.init();
}
#endif
} FTMotionDisableInScope_t;
} FTMotionDisableInScope_t;
#endif
#define FTM_DISABLE_IN_SCOPE() TERN(FTM_HOME_AND_PROBE, NOOP, FTMotionDisableInScope FT_Disabler)

2
Marlin/src/module/ft_motion/stepping.cpp
View file

@ -29,7 +29,7 @@
void Stepping::reset() {
stepper_plan.reset();
delta_error_q32.set(LOGICAL_AXIS_LIST_1(1 << 31)); // Start as 0.5 in q32 so steps are rounded
delta_error_q32.set(LOGICAL_AXIS_LIST_1(1UL << 31)); // Start as 0.5 in q32 so steps are rounded
step_bits = 0;
bresenham_iterations_pending = 0;
}