From 4e7f945046dc3d48efd9a40793ee2b32f19fb0ea Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Mon, 27 Nov 2023 14:36:33 +0000 Subject: [PATCH 1/2] Remove i03 XBPM trigger timeout --- src/dodal/devices/xbpm_feedback.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dodal/devices/xbpm_feedback.py b/src/dodal/devices/xbpm_feedback.py index d87926f586..d0243f50ba 100644 --- 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 ) From 4353f39d7de41377f4e299113b490313486a9913 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Mon, 27 Nov 2023 14:41:50 +0000 Subject: [PATCH 2/2] change oav_config_file location --- src/dodal/devices/oav/oav_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dodal/devices/oav/oav_parameters.py b/src/dodal/devices/oav/oav_parameters.py index a70eb7114d..4b8661e9ee 100644 --- a/src/dodal/devices/oav/oav_parameters.py +++ b/src/dodal/devices/oav/oav_parameters.py @@ -11,7 +11,7 @@ OAV_CONFIG_FILE_DEFAULTS = { "zoom_params_file": "/dls_sw/i03/software/gda/configurations/i03-config/xml/jCameraManZoomLevels.xml", - "oav_config_json": "/dls_sw/i03/software/gda/configurations/i03-config/etc/OAVCentring.json", + "oav_config_json": "/dls_sw/i03/software/daq_configuration/json/OAVCentring_hyperion.json", "display_config": "/dls_sw/i03/software/gda_versions/var/display.configuration", }