Skip to content

Commit 0db3e29

Browse files
thinkyheadthinkyhead
committed
WATCH_ALL_RUNOUT_SENSORS
MarlinFirmware/Marlin#20327
1 parent 62338c8 commit 0db3e29

File tree

246 files changed

+1230
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+1230
-492
lines changed

‎config/default/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,8 @@
12841284
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12851285
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12861286
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1287+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1288+
// This is automatically enabled for MIXING_EXTRUDERs.
12871289

12881290
// Override individually if the runout sensors vary
12891291
//#define FIL_RUNOUT1_STATE LOW
@@ -1318,8 +1320,9 @@
13181320
//#define FIL_RUNOUT8_PULLUP
13191321
//#define FIL_RUNOUT8_PULLDOWN
13201322

1321-
// Set one or more commands to execute on filament runout.
1322-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1323+
// Commands to execute on filament runout.
1324+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1325+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13231326
#define FILAMENT_RUNOUT_SCRIPT "M600"
13241327

13251328
// After a runout is detected, continue printing this length of filament

‎config/examples/3DFabXYZ/Migbot/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,6 +1286,8 @@
12861286
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12871287
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12881288
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1289+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1290+
// This is automatically enabled for MIXING_EXTRUDERs.
12891291

12901292
// Override individually if the runout sensors vary
12911293
//#define FIL_RUNOUT1_STATE LOW
@@ -1320,8 +1322,9 @@
13201322
//#define FIL_RUNOUT8_PULLUP
13211323
//#define FIL_RUNOUT8_PULLDOWN
13221324

1323-
// Set one or more commands to execute on filament runout.
1324-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1325+
// Commands to execute on filament runout.
1326+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1327+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13251328
#define FILAMENT_RUNOUT_SCRIPT "M600"
13261329

13271330
// After a runout is detected, continue printing this length of filament

‎config/examples/ADIMLab/Gantry v1/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@
12851285
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12861286
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12871287
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1288+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1289+
// This is automatically enabled for MIXING_EXTRUDERs.
12881290

12891291
// Override individually if the runout sensors vary
12901292
//#define FIL_RUNOUT1_STATE LOW
@@ -1319,8 +1321,9 @@
13191321
//#define FIL_RUNOUT8_PULLUP
13201322
//#define FIL_RUNOUT8_PULLDOWN
13211323

1322-
// Set one or more commands to execute on filament runout.
1323-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1324+
// Commands to execute on filament runout.
1325+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1326+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13241327
#define FILAMENT_RUNOUT_SCRIPT "M600"
13251328

13261329
// After a runout is detected, continue printing this length of filament

‎config/examples/ADIMLab/Gantry v2/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@
12851285
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12861286
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12871287
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1288+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1289+
// This is automatically enabled for MIXING_EXTRUDERs.
12881290

12891291
// Override individually if the runout sensors vary
12901292
//#define FIL_RUNOUT1_STATE LOW
@@ -1319,8 +1321,9 @@
13191321
//#define FIL_RUNOUT8_PULLUP
13201322
//#define FIL_RUNOUT8_PULLDOWN
13211323

1322-
// Set one or more commands to execute on filament runout.
1323-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1324+
// Commands to execute on filament runout.
1325+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1326+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13241327
#define FILAMENT_RUNOUT_SCRIPT "M600"
13251328

13261329
// After a runout is detected, continue printing this length of filament

‎config/examples/AlephObjects/TAZ4/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,8 @@
12951295
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12961296
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12971297
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1298+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1299+
// This is automatically enabled for MIXING_EXTRUDERs.
12981300

12991301
// Override individually if the runout sensors vary
13001302
//#define FIL_RUNOUT1_STATE LOW
@@ -1329,8 +1331,9 @@
13291331
//#define FIL_RUNOUT8_PULLUP
13301332
//#define FIL_RUNOUT8_PULLDOWN
13311333

1332-
// Set one or more commands to execute on filament runout.
1333-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1334+
// Commands to execute on filament runout.
1335+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1336+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13341337
#define FILAMENT_RUNOUT_SCRIPT "M600"
13351338

13361339
// After a runout is detected, continue printing this length of filament

‎config/examples/Alfawise/U20-bltouch/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,8 @@
13541354
#define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.
13551355
//#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
13561356
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1357+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1358+
// This is automatically enabled for MIXING_EXTRUDERs.
13571359

13581360
// Override individually if the runout sensors vary
13591361
//#define FIL_RUNOUT1_STATE LOW
@@ -1388,8 +1390,9 @@
13881390
//#define FIL_RUNOUT8_PULLUP
13891391
//#define FIL_RUNOUT8_PULLDOWN
13901392

1391-
// Set one or more commands to execute on filament runout.
1392-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1393+
// Commands to execute on filament runout.
1394+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1395+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13931396
#define FILAMENT_RUNOUT_SCRIPT "M600"
13941397

13951398
// After a runout is detected, continue printing this length of filament

‎config/examples/Alfawise/U20/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,8 @@
13561356
#define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.
13571357
//#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
13581358
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1359+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1360+
// This is automatically enabled for MIXING_EXTRUDERs.
13591361

13601362
// Override individually if the runout sensors vary
13611363
//#define FIL_RUNOUT1_STATE LOW
@@ -1390,8 +1392,9 @@
13901392
//#define FIL_RUNOUT8_PULLUP
13911393
//#define FIL_RUNOUT8_PULLDOWN
13921394

1393-
// Set one or more commands to execute on filament runout.
1394-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1395+
// Commands to execute on filament runout.
1396+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1397+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13951398
#define FILAMENT_RUNOUT_SCRIPT "M600"
13961399

13971400
// After a runout is detected, continue printing this length of filament

‎config/examples/AliExpress/CL-260/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,8 @@
12841284
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12851285
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12861286
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1287+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1288+
// This is automatically enabled for MIXING_EXTRUDERs.
12871289

12881290
// Override individually if the runout sensors vary
12891291
//#define FIL_RUNOUT1_STATE LOW
@@ -1318,8 +1320,9 @@
13181320
//#define FIL_RUNOUT8_PULLUP
13191321
//#define FIL_RUNOUT8_PULLDOWN
13201322

1321-
// Set one or more commands to execute on filament runout.
1322-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1323+
// Commands to execute on filament runout.
1324+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1325+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13231326
#define FILAMENT_RUNOUT_SCRIPT "M600"
13241327

13251328
// After a runout is detected, continue printing this length of filament

‎config/examples/AliExpress/UM2pExt/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@
12851285
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12861286
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12871287
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1288+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1289+
// This is automatically enabled for MIXING_EXTRUDERs.
12881290

12891291
// Override individually if the runout sensors vary
12901292
//#define FIL_RUNOUT1_STATE LOW
@@ -1319,8 +1321,9 @@
13191321
//#define FIL_RUNOUT8_PULLUP
13201322
//#define FIL_RUNOUT8_PULLDOWN
13211323

1322-
// Set one or more commands to execute on filament runout.
1323-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1324+
// Commands to execute on filament runout.
1325+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1326+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13241327
#define FILAMENT_RUNOUT_SCRIPT "M600"
13251328

13261329
// After a runout is detected, continue printing this length of filament

‎config/examples/Anet/A2/Configuration.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,8 @@
12841284
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
12851285
#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
12861286
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
1287+
//#define WATCH_ALL_RUNOUT_SENSORS // Execute runout script on any triggering sensor, not only for the active extruder.
1288+
// This is automatically enabled for MIXING_EXTRUDERs.
12871289

12881290
// Override individually if the runout sensors vary
12891291
//#define FIL_RUNOUT1_STATE LOW
@@ -1318,8 +1320,9 @@
13181320
//#define FIL_RUNOUT8_PULLUP
13191321
//#define FIL_RUNOUT8_PULLDOWN
13201322

1321-
// Set one or more commands to execute on filament runout.
1322-
// (After 'M412 H' Marlin will ask the host to handle the process.)
1323+
// Commands to execute on filament runout.
1324+
// With multiple runout sensors use the %c placeholder for the current tool in commands (e.g., "M600 T%c")
1325+
// NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
13231326
#define FILAMENT_RUNOUT_SCRIPT "M600"
13241327

13251328
// After a runout is detected, continue printing this length of filament

0 commit comments

Comments
 (0)