From b723e3fd0233a3519344f9de3f060be1fcd65315 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 25 Sep 2025 22:18:15 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Resume=20motion=20tracking=20on?=
 =?UTF-8?q?=20runout.reset()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix an issue where the filament motion sensor is ignored after a runout is resolved.
---
 Marlin/src/feature/runout.h | 56 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index e6b4daaa6d..5d130a23fe 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -143,38 +143,37 @@ class TFilamentMonitor : public FilamentMonitorBase {
 
     // Give the response a chance to update its counter.
     static void run() {
-      if (enabled && !filament_ran_out && should_monitor_runout()) {
-        TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, cli()); // Prevent RunoutResponseDelayed::block_completed from accumulating here
-        response.run();
-        sensor.run();
-        const runout_flags_t runout_flags = response.has_run_out();
-        TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, sei());
-        #if MULTI_FILAMENT_SENSOR
-          #if ENABLED(WATCH_ALL_RUNOUT_SENSORS)
-            const bool ran_out = bool(runout_flags);  // any sensor triggers
-            uint8_t extruder = 0;
-            if (ran_out) while (!runout_flags.test(extruder)) extruder++;
-          #else
-            const bool ran_out = runout_flags[active_extruder];  // suppress non active extruders
-            uint8_t extruder = active_extruder;
-          #endif
+      if (!enabled || filament_ran_out || !should_monitor_runout()) return;
+      TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, cli()); // Prevent RunoutResponseDelayed::block_completed from accumulating here
+      response.run();
+      sensor.run();
+      const runout_flags_t runout_flags = response.has_run_out();
+      TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, sei());
+      #if MULTI_FILAMENT_SENSOR
+        #if ENABLED(WATCH_ALL_RUNOUT_SENSORS)
+          const bool ran_out = bool(runout_flags);  // any sensor triggers
+          uint8_t extruder = 0;
+          if (ran_out) while (!runout_flags.test(extruder)) extruder++;
         #else
-          const bool ran_out = bool(runout_flags);
+          const bool ran_out = runout_flags[active_extruder];  // suppress non active extruders
           uint8_t extruder = active_extruder;
         #endif
+      #else
+        const bool ran_out = bool(runout_flags);
+        uint8_t extruder = active_extruder;
+      #endif
 
-        if (ran_out) {
-          #if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
-            SERIAL_ECHOPGM("Runout Sensors: ");
-            for (uint8_t i = 0; i < 8; ++i) SERIAL_CHAR('0' + char(runout_flags[i]));
-            SERIAL_ECHOLNPGM(" -> ", extruder, " RUN OUT");
-          #endif
+      if (!ran_out) return;
 
-          filament_ran_out = true;
-          event_filament_runout(extruder);
-          planner.synchronize();
-        }
-      }
+      #if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
+        SERIAL_ECHOPGM("Runout Sensors: ");
+        for (uint8_t i = 0; i < 8; ++i) SERIAL_CHAR('0' + char(runout_flags[i]));
+        SERIAL_ECHOLNPGM(" -> ", extruder, " RUN OUT");
+      #endif
+
+      filament_ran_out = true;
+      event_filament_runout(extruder);
+      planner.synchronize();
     }
 
     // Reset after a filament runout or upon resuming a job
@@ -392,6 +391,7 @@ class FilamentSensorBase {
         #if ENABLED(FILAMENT_SWITCH_AND_MOTION)
           for (uint8_t i = 0; i < NUM_MOTION_SENSORS; ++i) filament_motion_present(i);
         #endif
+        set_ignore_motion(false);
       }
 
       static void run() {
@@ -484,7 +484,7 @@ class FilamentSensorBase {
       static void init_for_restart(const bool onoff=true) {
         UNUSED(onoff);
         #if ENABLED(FILAMENT_SWITCH_AND_MOTION)
-          reset();
+          reset(); // also calls set_ignore_motion(false)
           set_ignore_motion(!onoff);
         #endif
       }