Merge pull request #245 from DiamondLightSource/remove_i03_xbpm_timeout

Apply hotfixes from previous release
DiamondLightSource · Nov 28, 2023 · 93145a9 · 93145a9
2 parents 0d960bb + 3b1557e
commit 93145a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/dodal/devices/oav/oav_parameters.py b/src/dodal/devices/oav/oav_parameters.py
@@ -3,7 +3,7 @@
 from typing import Any
 
 OAV_CONFIG_JSON = (
-    "/dls_sw/i03/software/gda/configurations/i03-config/etc/OAVCentring.json"
+    "/dls_sw/i03/software/daq_configuration/json/OAVCentring_hyperion.json"
 )
 
 

diff --git a/src/dodal/devices/xbpm_feedback.py b/src/dodal/devices/xbpm_feedback.py
@@ -18,9 +18,7 @@ class XBPMFeedback(Device):
 
     def trigger(self) -> StatusBase:
         return SubscriptionStatus(
-            self.pos_stable,
-            lambda *, old_value, value, **kwargs: value == 1,
-            timeout=60,
+            self.pos_stable, lambda *, old_value, value, **kwargs: value == 1
         )