Apply fixed EXTRUDER_RUNOUT_PREVENT

Marlin/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/Marlin_main.cpp

@@ -8608,11 +8608,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
   #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
     if (ELAPSED(ms, previous_cmd_ms + (EXTRUDER_RUNOUT_SECONDS) * 1000UL)
       && thermalManager.degHotend(active_extruder) > EXTRUDER_RUNOUT_MINTEMP) {
+      bool oldstatus;
       #if ENABLED(SWITCHING_EXTRUDER)
-        bool oldstatus = E0_ENABLE_READ;
+        oldstatus = E0_ENABLE_READ;
         enable_e0();
       #else // !SWITCHING_EXTRUDER
-        bool oldstatus;
         switch (active_extruder) {
           case 0:
             oldstatus = E0_ENABLE_READ;
@@ -8639,15 +8639,14 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
         }
       #endif // !SWITCHING_EXTRUDER
 
-      float oldepos = current_position[E_AXIS], oldedes = destination[E_AXIS];
-      planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS],
-                       destination[E_AXIS] + (EXTRUDER_RUNOUT_EXTRUDE) * (EXTRUDER_RUNOUT_ESTEPS) * planner.steps_to_mm[E_AXIS],
-                       MMM_TO_MMS(EXTRUDER_RUNOUT_SPEED) * (EXTRUDER_RUNOUT_ESTEPS) * planner.steps_to_mm[E_AXIS], active_extruder);
-      current_position[E_AXIS] = oldepos;
-      destination[E_AXIS] = oldedes;
-      planner.set_e_position_mm(oldepos);
       previous_cmd_ms = ms; // refresh_cmd_timeout()
+      planner.buffer_line(
+        current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS],
+        current_position[E_AXIS] + EXTRUDER_RUNOUT_EXTRUDE,
+        MMM_TO_MMS(EXTRUDER_RUNOUT_SPEED), active_extruder
+      );
       stepper.synchronize();
+      planner.set_e_position_mm(current_position[E_AXIS]);
       #if ENABLED(SWITCHING_EXTRUDER)
         E0_ENABLE_WRITE(oldstatus);
       #else

Marlin/example_configurations/Cartesio/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/Felix/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/Hephestos/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/Hephestos_2/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/K8200/Configuration_adv.h

@@ -174,14 +174,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/K8400/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/RigidBot/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/SCARA/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 180
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 180   // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 180  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5  // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/TAZ4/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/WITBOX/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/delta/biv2.5/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/delta/generic/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h

@@ -173,14 +173,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/makibox/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature
 

Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

@@ -168,14 +168,16 @@
 
 // @section extruder
 
-//  extruder run-out prevention.
+// Extruder runout prevention.
-//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
+// If the machine is idle and the temperature over MINTEMP
+// then extrude some filament every couple of SECONDS.
 //#define EXTRUDER_RUNOUT_PREVENT
-#define EXTRUDER_RUNOUT_MINTEMP 190
+#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
-#define EXTRUDER_RUNOUT_SECONDS 30
+  #define EXTRUDER_RUNOUT_MINTEMP 190
-#define EXTRUDER_RUNOUT_ESTEPS 14   // mm filament
+  #define EXTRUDER_RUNOUT_SECONDS 30
-#define EXTRUDER_RUNOUT_SPEED 1500  // extrusion speed
+  #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
-#define EXTRUDER_RUNOUT_EXTRUDE 100
+  #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
+#endif
 
 // @section temperature