diff --git a/klippy/extras/output_pin.py b/klippy/extras/output_pin.py
index 4e79f2ad..bde7ea69 100644
--- a/klippy/extras/output_pin.py
+++ b/klippy/extras/output_pin.py
@@ -1,6 +1,6 @@
 # PWM and digital output pin handling
 #
-# Copyright (C) 2017-2024  Kevin O'Connor <kevin@koconnor.net>
+# Copyright (C) 2017-2025  Kevin O'Connor <kevin@koconnor.net>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging, ast
@@ -11,8 +11,6 @@ from .display import display
 # G-Code request queuing helper
 ######################################################################
 
-PIN_MIN_TIME = 0.100
-
 # Helper code to queue g-code requests
 class GCodeRequestQueue:
     def __init__(self, config, mcu, callback):
@@ -27,6 +25,7 @@ class GCodeRequestQueue:
     def _handle_connect(self):
         self.toolhead = self.printer.lookup_object('toolhead')
     def _flush_notification(self, print_time, clock):
+        min_sched_time = self.mcu.min_schedule_time()
         rqueue = self.rqueue
         while rqueue:
             next_time = max(rqueue[0][0], self.next_min_flush_time)
@@ -49,7 +48,7 @@ class GCodeRequestQueue:
                 if action == "delay":
                     pos -= 1
             del rqueue[:pos+1]
-            self.next_min_flush_time = next_time + max(min_wait, PIN_MIN_TIME)
+            self.next_min_flush_time = next_time + max(min_wait, min_sched_time)
             # Ensure following queue items are flushed
             self.toolhead.note_mcu_movequeue_activity(self.next_min_flush_time)
     def _queue_request(self, print_time, value):
@@ -59,9 +58,10 @@ class GCodeRequestQueue:
         self.toolhead.register_lookahead_callback(
             (lambda pt: self._queue_request(pt, value)))
     def send_async_request(self, value, print_time=None):
+        min_sched_time = self.mcu.min_schedule_time()
         if print_time is None:
             systime = self.printer.get_reactor().monotonic()
-            print_time = self.mcu.estimated_print_time(systime + PIN_MIN_TIME)
+            print_time = self.mcu.estimated_print_time(systime + min_sched_time)
         while 1:
             next_time = max(print_time, self.next_min_flush_time)
             # Invoke callback for the request
@@ -72,7 +72,7 @@ class GCodeRequestQueue:
                 action, min_wait = ret
                 if action == "discard":
                     break
-            self.next_min_flush_time = next_time + max(min_wait, PIN_MIN_TIME)
+            self.next_min_flush_time = next_time + max(min_wait, min_sched_time)
             if action != "delay":
                 break
 
@@ -184,8 +184,6 @@ def lookup_template_eval(config):
 # Main output pin handling
 ######################################################################
 
-MAX_SCHEDULE_TIME = 5.0
-
 class PrinterOutputPin:
     def __init__(self, config):
         self.printer = config.get_printer()
@@ -194,8 +192,9 @@ class PrinterOutputPin:
         self.is_pwm = config.getboolean('pwm', False)
         if self.is_pwm:
             self.mcu_pin = ppins.setup_pin('pwm', config.get('pin'))
+            max_duration = self.mcu_pin.get_mcu().max_nominal_duration()
             cycle_time = config.getfloat('cycle_time', 0.100, above=0.,
-                                         maxval=MAX_SCHEDULE_TIME)
+                                         maxval=max_duration)
             hardware_pwm = config.getboolean('hardware_pwm', False)
             self.mcu_pin.setup_cycle_time(cycle_time, hardware_pwm)
             self.scale = config.getfloat('scale', 1., above=0.)