FIX #219

apstools/devices.py

@@ -1412,7 +1412,7 @@ def value(self):
     def settled(self):
         """Is signal close enough to target?"""
         diff = abs(self.signal.get() - self.target.value)
-        return diff <= self.tolerance
+        return diff <= self.tolerance.value
 
     def wait_until_settled(self, timeout=None, timeout_fail=False):
         """
@@ -1447,7 +1447,7 @@ def changing_cb(*args, **kwargs):
                         raise TimeoutError(msg)
                     continue
                 if elapsed >= report:
-                    report += self.report_interval_s.value
+                    report += self.report_interval_s
                     msg = f"Waiting {elapsed:.1f}s"
                     msg += f" to reach {self.target.value:.2f}{self.units.value}"
                     msg += f", now {self.signal.get():.2f}{self.units.value}"