Merge remote-tracking branch 'origin/signal-settle-time' into signal-…

…settle-time
bluesky · Oct 7, 2022 · 34eecb5 · 34eecb5
2 parents c192c7f + 039cb29
commit 34eecb5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ophyd/signal.py b/ophyd/signal.py
@@ -337,7 +337,7 @@ def set(self, value, *, timeout=None, settle_time=None, **kwargs):
             kwargs,
         )
 
-        settle_time = settle_time or self.settle_time
+        settle_time = settle_time if settle_time is not None else self.settle_time
 
         def set_thread():
             try: