Skip to content

Commit 4a0b539

Browse files
thinkyheadthinkyhead
committed
🔧 Clarify axis disable / timeout (MarlinFirmware#25571)
1 parent ee08814 commit 4a0b539

File tree

16 files changed

+133
-68
lines changed

16 files changed

+133
-68
lines changed

‎Marlin/Configuration.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,8 +1645,8 @@
16451645

16461646
// @section extruder
16471647

1648-
#define DISABLE_E false // Disable the extruder when not stepping
1649-
#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled
1648+
#define DISABLE_E false // Disable the extruder when not stepping
1649+
#define DISABLE_OTHER_EXTRUDERS // Keep only the active extruder enabled
16501650

16511651
// @section motion
16521652

‎Marlin/Configuration_adv.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,20 +1114,20 @@
11141114

11151115
/**
11161116
* Idle Stepper Shutdown
1117-
* Set DISABLE_INACTIVE_? 'true' to shut down axis steppers after an idle period.
1118-
* The Deactive Time can be overridden with M18 and M84. Set to 0 for No Timeout.
1117+
* Enable DISABLE_IDLE_* to shut down axis steppers after an idle period.
1118+
* The default timeout duration can be overridden with M18 and M84. Set to 0 for No Timeout.
11191119
*/
1120-
#define DEFAULT_STEPPER_DEACTIVE_TIME 120
1121-
#define DISABLE_INACTIVE_X true
1122-
#define DISABLE_INACTIVE_Y true
1123-
#define DISABLE_INACTIVE_Z true // Set 'false' if the nozzle could fall onto your printed part!
1124-
#define DISABLE_INACTIVE_I true
1125-
#define DISABLE_INACTIVE_J true
1126-
#define DISABLE_INACTIVE_K true
1127-
#define DISABLE_INACTIVE_U true
1128-
#define DISABLE_INACTIVE_V true
1129-
#define DISABLE_INACTIVE_W true
1130-
#define DISABLE_INACTIVE_E true
1120+
#define DEFAULT_STEPPER_TIMEOUT_SEC 120
1121+
#define DISABLE_IDLE_X
1122+
#define DISABLE_IDLE_Y
1123+
#define DISABLE_IDLE_Z // Disable if the nozzle could fall onto your printed part!
1124+
//#define DISABLE_IDLE_I
1125+
//#define DISABLE_IDLE_J
1126+
//#define DISABLE_IDLE_K
1127+
//#define DISABLE_IDLE_U
1128+
//#define DISABLE_IDLE_V
1129+
//#define DISABLE_IDLE_W
1130+
#define DISABLE_IDLE_E // Shut down all idle extruders
11311131

11321132
// Default Minimum Feedrates for printing and travel moves
11331133
#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S.

‎Marlin/config.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ busy_while_heating = on
127127
default_ejerk = 5.0
128128
default_keepalive_interval = 2
129129
default_leveling_fade_height = 0.0
130-
disable_inactive_extruder = on
130+
disable_other_extruders = on
131131
display_charset_hd44780 = JAPANESE
132132
eeprom_boot_silent = on
133133
eeprom_chitchat = on
@@ -176,12 +176,12 @@ auto_report_temperatures = on
176176
autotemp = on
177177
autotemp_oldweight = 0.98
178178
bed_check_interval = 5000
179-
default_stepper_deactive_time = 120
179+
default_stepper_timeout_sec = 120
180180
default_volumetric_extruder_limit = 0.00
181-
disable_inactive_e = true
182-
disable_inactive_x = true
183-
disable_inactive_y = true
184-
disable_inactive_z = true
181+
disable_idle_x = on
182+
disable_idle_y = on
183+
disable_idle_z = on
184+
disable_idle_e = on
185185
e0_auto_fan_pin = -1
186186
encoder_100x_steps_per_sec = 80
187187
encoder_10x_steps_per_sec = 30

‎Marlin/src/MarlinCore.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
431431
if (has_blocks) gcode.reset_stepper_timeout(ms); // Reset timeout for M18/M84, M85 max 'kill', and laser.
432432

433433
// M18 / M84 : Handle steppers inactive time timeout
434-
#if HAS_DISABLE_INACTIVE_AXIS
434+
#if HAS_DISABLE_IDLE_AXES
435435
if (gcode.stepper_inactive_time) {
436436

437437
static bool already_shutdown_steppers; // = false
@@ -441,16 +441,16 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
441441
already_shutdown_steppers = true;
442442

443443
// Individual axes will be disabled if configured
444-
TERN_(DISABLE_INACTIVE_X, stepper.disable_axis(X_AXIS));
445-
TERN_(DISABLE_INACTIVE_Y, stepper.disable_axis(Y_AXIS));
446-
TERN_(DISABLE_INACTIVE_Z, stepper.disable_axis(Z_AXIS));
447-
TERN_(DISABLE_INACTIVE_I, stepper.disable_axis(I_AXIS));
448-
TERN_(DISABLE_INACTIVE_J, stepper.disable_axis(J_AXIS));
449-
TERN_(DISABLE_INACTIVE_K, stepper.disable_axis(K_AXIS));
450-
TERN_(DISABLE_INACTIVE_U, stepper.disable_axis(U_AXIS));
451-
TERN_(DISABLE_INACTIVE_V, stepper.disable_axis(V_AXIS));
452-
TERN_(DISABLE_INACTIVE_W, stepper.disable_axis(W_AXIS));
453-
TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
444+
TERN_(DISABLE_IDLE_X, stepper.disable_axis(X_AXIS));
445+
TERN_(DISABLE_IDLE_Y, stepper.disable_axis(Y_AXIS));
446+
TERN_(DISABLE_IDLE_Z, stepper.disable_axis(Z_AXIS));
447+
TERN_(DISABLE_IDLE_I, stepper.disable_axis(I_AXIS));
448+
TERN_(DISABLE_IDLE_J, stepper.disable_axis(J_AXIS));
449+
TERN_(DISABLE_IDLE_K, stepper.disable_axis(K_AXIS));
450+
TERN_(DISABLE_IDLE_U, stepper.disable_axis(U_AXIS));
451+
TERN_(DISABLE_IDLE_V, stepper.disable_axis(V_AXIS));
452+
TERN_(DISABLE_IDLE_W, stepper.disable_axis(W_AXIS));
453+
TERN_(DISABLE_IDLE_E, stepper.disable_e_steppers());
454454

455455
TERN_(AUTO_BED_LEVELING_UBL, bedlevel.steppers_were_disabled());
456456
}

‎Marlin/src/gcode/control/M17_M18_M84.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void try_to_disable(const stepper_flags_t to_disable) {
212212
void GcodeSuite::M18_M84() {
213213
if (parser.seenval('S')) {
214214
reset_stepper_timeout();
215-
#if HAS_DISABLE_INACTIVE_AXIS
215+
#if HAS_DISABLE_IDLE_AXES
216216
const millis_t ms = parser.value_millis_from_seconds();
217217
#if LASER_SAFETY_TIMEOUT_MS > 0
218218
if (ms && ms <= LASER_SAFETY_TIMEOUT_MS) {

‎Marlin/src/gcode/gcode.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ GcodeSuite gcode;
7575
millis_t GcodeSuite::previous_move_ms = 0,
7676
GcodeSuite::max_inactive_time = 0;
7777

78-
#if HAS_DISABLE_INACTIVE_AXIS
79-
millis_t GcodeSuite::stepper_inactive_time = SEC_TO_MS(DEFAULT_STEPPER_DEACTIVE_TIME);
78+
#if HAS_DISABLE_IDLE_AXES
79+
millis_t GcodeSuite::stepper_inactive_time = SEC_TO_MS(DEFAULT_STEPPER_TIMEOUT_SEC);
8080
#endif
8181

8282
// Relative motion mode for each logical axis

‎Marlin/src/gcode/gcode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class GcodeSuite {
403403
}
404404
FORCE_INLINE static void reset_stepper_timeout(const millis_t ms=millis()) { previous_move_ms = ms; }
405405

406-
#if HAS_DISABLE_INACTIVE_AXIS
406+
#if HAS_DISABLE_IDLE_AXES
407407
static millis_t stepper_inactive_time;
408408
FORCE_INLINE static bool stepper_inactive_timeout(const millis_t ms=millis()) {
409409
return ELAPSED(ms, previous_move_ms + stepper_inactive_time);

‎Marlin/src/inc/Conditionals_LCD.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@
608608
#undef PREVENT_LENGTHY_EXTRUDE
609609
#undef FILAMENT_RUNOUT_SENSOR
610610
#undef FILAMENT_RUNOUT_DISTANCE_MM
611-
#undef DISABLE_INACTIVE_EXTRUDER
611+
#undef DISABLE_OTHER_EXTRUDERS
612612
#endif
613613

614614
#define E_OPTARG(N) OPTARG(HAS_MULTI_EXTRUDER, N)
@@ -654,8 +654,8 @@
654654
#endif
655655

656656
// No inactive extruders with SWITCHING_NOZZLE or Průša MMU1
657-
#if ENABLED(SWITCHING_NOZZLE) || HAS_PRUSA_MMU1
658-
#undef DISABLE_INACTIVE_EXTRUDER
657+
#if EITHER(SWITCHING_NOZZLE, HAS_PRUSA_MMU1)
658+
#undef DISABLE_OTHER_EXTRUDERS
659659
#endif
660660

661661
// Průša MMU1, MMU(S) 2.0 and EXTENDABLE_EMU_MMU2(S) force SINGLENOZZLE
@@ -908,6 +908,15 @@
908908
#undef MAX_SOFTWARE_ENDSTOP_W
909909
#endif
910910

911+
#define _OR_HAS_DA(A) ENABLED(DISABLE_##A) ||
912+
#if MAP(_OR_HAS_DA, X, Y, Z, I, J, K, U, V, W) 0
913+
#define HAS_DISABLE_MAIN_AXES 1
914+
#endif
915+
#if HAS_DISABLE_MAIN_AXES || ENABLED(DISABLE_E)
916+
#define HAS_DISABLE_AXES 1
917+
#endif
918+
#undef _OR_HAS_DA
919+
911920
#ifdef X2_DRIVER_TYPE
912921
#define HAS_X2_STEPPER 1
913922
// Dual X Carriage isn't known yet. TODO: Consider moving it to Configuration.h.

‎Marlin/src/inc/Conditionals_adv.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,37 +88,50 @@
8888

8989
// Some options are disallowed without required axes
9090
#if !HAS_Y_AXIS
91+
#undef DISABLE_IDLE_Y
9192
#undef SAFE_BED_LEVELING_START_Y
9293
#undef ARC_SUPPORT
9394
#undef INPUT_SHAPING_Y
9495
#undef SHAPING_FREQ_Y
9596
#undef SHAPING_BUFFER_Y
9697
#endif
9798
#if !HAS_Z_AXIS
99+
#undef DISABLE_IDLE_Z
100+
#undef ENABLE_LEVELING_FADE_HEIGHT
101+
#undef HOME_Z_FIRST
102+
#undef HOMING_Z_WITH_PROBE
103+
#undef NUM_Z_STEPPERS
98104
#undef SAFE_BED_LEVELING_START_Z
99105
#endif
100106
#if !HAS_I_AXIS
107+
#undef DISABLE_IDLE_I
101108
#undef SAFE_BED_LEVELING_START_I
102109
#endif
103110
#if !HAS_J_AXIS
111+
#undef DISABLE_IDLE_J
104112
#undef SAFE_BED_LEVELING_START_J
105113
#endif
106114
#if !HAS_K_AXIS
115+
#undef DISABLE_IDLE_K
107116
#undef SAFE_BED_LEVELING_START_K
108117
#endif
109118
#if !HAS_U_AXIS
119+
#undef DISABLE_IDLE_U
110120
#undef SAFE_BED_LEVELING_START_U
111121
#endif
112122
#if !HAS_V_AXIS
123+
#undef DISABLE_IDLE_V
113124
#undef SAFE_BED_LEVELING_START_V
114125
#endif
115126
#if !HAS_W_AXIS
127+
#undef DISABLE_IDLE_W
116128
#undef SAFE_BED_LEVELING_START_W
117129
#endif
118130

119131
// Disallowed with no extruders
120132
#if !HAS_EXTRUDERS
121133
#define NO_VOLUMETRICS
134+
#undef DISABLE_IDLE_E
122135
#undef FWRETRACT
123136
#undef PIDTEMP
124137
#undef AUTOTEMP
@@ -135,6 +148,43 @@
135148
#undef STEALTHCHOP_E
136149
#endif
137150

151+
#if ENABLED(DISABLE_X) && !defined(DISABLE_IDLE_X)
152+
#define DISABLE_IDLE_X
153+
#endif
154+
#if ENABLED(DISABLE_Y) && !defined(DISABLE_IDLE_Y)
155+
#define DISABLE_IDLE_Y
156+
#endif
157+
#if ENABLED(DISABLE_Z) && !defined(DISABLE_IDLE_Z)
158+
#define DISABLE_IDLE_Z
159+
#endif
160+
#if ENABLED(DISABLE_I) && !defined(DISABLE_IDLE_I)
161+
#define DISABLE_IDLE_I
162+
#endif
163+
#if ENABLED(DISABLE_J) && !defined(DISABLE_IDLE_J)
164+
#define DISABLE_IDLE_J
165+
#endif
166+
#if ENABLED(DISABLE_K) && !defined(DISABLE_IDLE_K)
167+
#define DISABLE_IDLE_K
168+
#endif
169+
#if ENABLED(DISABLE_U) && !defined(DISABLE_IDLE_U)
170+
#define DISABLE_IDLE_U
171+
#endif
172+
#if ENABLED(DISABLE_V) && !defined(DISABLE_IDLE_V)
173+
#define DISABLE_IDLE_V
174+
#endif
175+
#if ENABLED(DISABLE_W) && !defined(DISABLE_IDLE_W)
176+
#define DISABLE_IDLE_W
177+
#endif
178+
#if ENABLED(DISABLE_E) && !defined(DISABLE_IDLE_E)
179+
#define DISABLE_IDLE_E
180+
#endif
181+
182+
#define _OR_HAS_DI(A) || BOTH(HAS_##A##_AXIS, DISABLE_IDLE_##A)
183+
#if BOTH(HAS_EXTRUDERS, DISABLE_IDLE_E) MAP(_OR_HAS_DI, X, Y, Z, I, J, K, U, V, W)
184+
#define HAS_DISABLE_IDLE_AXES 1
185+
#endif
186+
#undef _OR_HAS_DI
187+
138188
#if HOTENDS <= 7
139189
#undef E7_AUTO_FAN_PIN
140190
#if HOTENDS <= 6

‎Marlin/src/inc/SanityCheck.h

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,12 @@
662662
#error "TMC_SW_(MOSI|MISO|SCK) is now TMC_SPI_(MOSI|MISO|SCK)."
663663
#elif defined(BTT_MINI_12864_V1)
664664
#error "BTT_MINI_12864_V1 is now BTT_MINI_12864."
665+
#elif defined(DISABLE_INACTIVE_X) || defined(DISABLE_INACTIVE_Y) || defined(DISABLE_INACTIVE_Z) \
666+
|| defined(DISABLE_INACTIVE_I) || defined(DISABLE_INACTIVE_J) || defined(DISABLE_INACTIVE_K) \
667+
|| defined(DISABLE_INACTIVE_U) || defined(DISABLE_INACTIVE_V) || defined(DISABLE_INACTIVE_W) || defined(DISABLE_INACTIVE_E)
668+
#error "DISABLE_INACTIVE_[XYZIJKUVWE] is now DISABLE_IDLE_[XYZIJKUVWE]."
669+
#elif defined(DEFAULT_STEPPER_DEACTIVE_TIME)
670+
#error "DEFAULT_STEPPER_DEACTIVE_TIME is now DEFAULT_STEPPER_TIMEOUT_SEC."
665671
#endif
666672

667673
// L64xx stepper drivers have been removed
@@ -1333,8 +1339,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS
13331339
#error "Please select either MIXING_EXTRUDER or SWITCHING_EXTRUDER, not both."
13341340
#elif ENABLED(SINGLENOZZLE)
13351341
#error "MIXING_EXTRUDER is incompatible with SINGLENOZZLE."
1336-
#elif ENABLED(DISABLE_INACTIVE_EXTRUDER)
1337-
#error "MIXING_EXTRUDER is incompatible with DISABLE_INACTIVE_EXTRUDER."
1342+
#elif ENABLED(DISABLE_OTHER_EXTRUDERS)
1343+
#error "MIXING_EXTRUDER is incompatible with DISABLE_OTHER_EXTRUDERS."
13381344
#elif HAS_FILAMENT_RUNOUT_DISTANCE
13391345
#error "MIXING_EXTRUDER is incompatible with FILAMENT_RUNOUT_DISTANCE_MM."
13401346
#endif
@@ -2195,10 +2201,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS
21952201
/**
21962202
* Make sure DISABLE_[XYZ] compatible with selected homing options
21972203
*/
2198-
#if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_U, DISABLE_V, DISABLE_W)
2199-
#if ANY(HOME_AFTER_DEACTIVATE, Z_SAFE_HOMING)
2200-
#error "DISABLE_[XYZIJKUVW] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
2201-
#endif
2204+
#if HAS_DISABLE_MAIN_AXES && ANY(HOME_AFTER_DEACTIVATE, Z_SAFE_HOMING)
2205+
#error "DISABLE_[XYZIJKUVW] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
22022206
#endif
22032207

22042208
/**
@@ -4133,7 +4137,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
41334137
#undef _PIN_CONFLICT
41344138

41354139
#ifdef LASER_SAFETY_TIMEOUT_MS
4136-
static_assert(LASER_SAFETY_TIMEOUT_MS < (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL, "LASER_SAFETY_TIMEOUT_MS must be less than DEFAULT_STEPPER_DEACTIVE_TIME (" STRINGIFY(DEFAULT_STEPPER_DEACTIVE_TIME) " seconds)");
4140+
static_assert(LASER_SAFETY_TIMEOUT_MS < (DEFAULT_STEPPER_TIMEOUT_SEC) * 1000UL, "LASER_SAFETY_TIMEOUT_MS must be less than DEFAULT_STEPPER_TIMEOUT_SEC (" STRINGIFY(DEFAULT_STEPPER_TIMEOUT_SEC) " seconds)");
41374141
#endif
41384142

41394143
#endif

0 commit comments

Comments
 (0)