From 4ffbc520d56ee171570c80bf0f2f10d754dbce9d Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 22 May 2024 14:27:48 +0000
Subject: [PATCH] Wait 2s after enabling FPGA_processing_enable_RW
---
README.md | 2 ++
tangostationcontrol/VERSION | 2 +-
.../devices/base_device_classes/lofar_device.py | 4 ++++
.../tangostationcontrol/devices/sdp/sdp.py | 8 ++++++++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3a55e8c1c..62903e05a 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,8 @@ Next change the version in the following places:
# Release Notes
+* 0.38.2 Fixed polling of some attributes required by Metadata device
+ Wait 2s after enabling FPGA_processing_enable_RW to allow it to propagate
* 0.38.1 Custom compiled casacore for improved beam-tracking performance
* 0.38.0 Add metadata device publishing zmq events
* 0.37.2 Improved event-subscription interface, avoid overlap between polling loops.
diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION
index bb22182d4..f2e78d495 100644
--- a/tangostationcontrol/VERSION
+++ b/tangostationcontrol/VERSION
@@ -1 +1 @@
-0.38.1
+0.38.2
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py b/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py
index e65c15213..8d1b18362 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py
+++ b/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py
@@ -785,6 +785,10 @@ class LOFARDevice(Device):
@debugit()
@log_exceptions()
def set_defaults(self):
+ # Defer to undecorated version that might be overloaded
+ self._set_defaults()
+
+ def _set_defaults(self):
"""Set hardware points to their default value.
A hardware point XXX is set to the value of the object member named XXX_default,
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
index 6c1cf3a49..5d56bff41 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
@@ -4,6 +4,7 @@
""" SDP Device Server for LOFAR2.0
"""
+import time
from typing import Dict, List, Tuple
import numpy
@@ -566,6 +567,13 @@ class SDP(OPCUADevice):
except ZeroDivisionError:
return 1.0
+ def _set_defaults(self):
+ super()._set_defaults()
+
+ # wait 2s for the BSN to propagate through the FPGAs after
+ # enabling FPGA_processing_enable_RW.
+ time.sleep(2.0)
+
def configure_for_initialise(self):
super().configure_for_initialise()
--
GitLab