From f52a6f9491e6bbb6c04f3634012ae23f41e8b857 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Wed, 3 Dec 2025 17:35:12 -0500
Subject: [PATCH] output_pin: Rename "delay" flag to "repeat" in
 GCodeRequestQueue()

Rename the flag to make it more clear what it does.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 klippy/extras/fan.py        |  2 +-
 klippy/extras/output_pin.py | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/klippy/extras/fan.py b/klippy/extras/fan.py
index c5677ba06..2bcc512d7 100644
--- a/klippy/extras/fan.py
+++ b/klippy/extras/fan.py
@@ -63,7 +63,7 @@ class Fan:
             self.last_req_value = value
             self.last_fan_value = self.max_power
             self.mcu_fan.set_pwm(print_time, self.max_power)
-            return "delay", self.kick_start_time
+            return "repeat", print_time + self.kick_start_time
         self.last_fan_value = self.last_req_value = value
         self.mcu_fan.set_pwm(print_time, value)
     def set_speed(self, value, print_time=None):
diff --git a/klippy/extras/output_pin.py b/klippy/extras/output_pin.py
index a15d55166..58a7302ca 100644
--- a/klippy/extras/output_pin.py
+++ b/klippy/extras/output_pin.py
@@ -38,23 +38,23 @@ class GCodeRequestQueue:
                 pos += 1
             req_pt, req_val = rqueue[pos]
             # Invoke callback for the request
-            min_wait = 0.
             ret = self.callback(next_time, req_val)
             if ret is not None:
                 # Handle special cases
-                action, min_wait = ret
+                action, next_min_time = ret
+                self.next_min_flush_time = max(self.next_min_flush_time,
+                                               next_min_time)
                 if action == "discard":
                     del rqueue[:pos+1]
                     continue
                 if action == "reschedule":
                     del rqueue[:pos]
-                    self.next_min_flush_time = max(self.next_min_flush_time,
-                                                   min_wait)
                     continue
-                if action == "delay":
+                if action == "repeat":
                     pos -= 1
             del rqueue[:pos+1]
-            self.next_min_flush_time = next_time + max(min_wait, min_sched_time)
+            self.next_min_flush_time = max(self.next_min_flush_time,
+                                           next_time + min_sched_time)
             # Ensure following queue items are flushed
             self.motion_queuing.note_mcu_movequeue_activity(
                 self.next_min_flush_time, is_step_gen=False)
@@ -73,19 +73,20 @@ class GCodeRequestQueue:
         while 1:
             next_time = max(print_time, self.next_min_flush_time)
             # Invoke callback for the request
-            action, min_wait = "normal", 0.
+            action, next_min_time = "normal", 0.
             ret = self.callback(next_time, value)
             if ret is not None:
                 # Handle special cases
-                action, min_wait = ret
+                action, next_min_time = ret
+                self.next_min_flush_time = max(self.next_min_flush_time,
+                                               next_min_time)
                 if action == "discard":
                     break
                 if action == "reschedule":
-                    self.next_min_flush_time = max(self.next_min_flush_time,
-                                                   min_wait)
                     continue
-            self.next_min_flush_time = next_time + max(min_wait, min_sched_time)
-            if action != "delay":
+            self.next_min_flush_time = max(self.next_min_flush_time,
+                                           next_time + min_sched_time)
+            if action != "repeat":
                 break