From 9d7fc612555511461c43a0b41c0c4a4a25f4ac56 Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Wed, 7 Apr 2021 18:38:13 +0200
Subject: [PATCH] fixed state bug
---
devices/HW_device_template.py | 1 +
devices/PCC.py | 1 -
devices/clients/test_client.py | 3 ++-
devices/src/attribute_wrapper.py | 17 +++++++++++------
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/devices/HW_device_template.py b/devices/HW_device_template.py
index 950faf39d..2b2b0a648 100644
--- a/devices/HW_device_template.py
+++ b/devices/HW_device_template.py
@@ -15,6 +15,7 @@
from tango.server import run
# Additional import
+from src.attribute_wrapper import *
from src.hardware_device import *
__all__ = ["HW_dev"]
diff --git a/devices/PCC.py b/devices/PCC.py
index 9e605cac2..d6b255335 100644
--- a/devices/PCC.py
+++ b/devices/PCC.py
@@ -112,7 +112,6 @@ class PCC(hardware_device):
# --------
def off(self):
""" user code here. is called when the state is set to OFF """
-
# Stop keep-alive
self.OPCua_client.stop()
diff --git a/devices/clients/test_client.py b/devices/clients/test_client.py
index ff85522d3..d7e1300c7 100644
--- a/devices/clients/test_client.py
+++ b/devices/clients/test_client.py
@@ -1,5 +1,6 @@
from src.comms_client import *
+import os
# <class 'numpy.bool_'>
@@ -28,7 +29,7 @@ class example_client(CommClient):
"""
this function provides a location for the code neccecary to connect to the client
"""
-
+ self.streams.debug_stream(os.path.dirname(os.path.abspath(__file__)))
self.streams.debug_stream("the example client doesn't actually connect to anything silly")
self.connected = True # set connected to true
diff --git a/devices/src/attribute_wrapper.py b/devices/src/attribute_wrapper.py
index 35670b070..03bd9d5e5 100644
--- a/devices/src/attribute_wrapper.py
+++ b/devices/src/attribute_wrapper.py
@@ -11,17 +11,22 @@ logger = logging.getLogger()
class attribute_wrapper(attribute):
"""
- Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
- """
+ Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
+ """
def __init__(self, comms_annotation=None, datatype=None, dims=(1,), access=AttrWriteType.READ, init_value=None, **kwargs):
"""
- wraps around the tango Attribute class. Provides an easier interface for 1d or 2d arrays. Also provides a way to abstract
- managing the communications interface.
- """
+ wraps around the tango Attribute class. Provides an easier interface for 1d or 2d arrays. Also provides a way to abstract
+ managing the communications interface.
+
+ comms_annotation: data passed along to the attribute. can be given any form of data. handling is up to client implementation
+ datatype: any numpy datatype
+ dims: dimensions of the
+ init_value: value
+ """
# ensure the type is a numpy array
- if "numpy" not in str(datatype) and type(datatype) != str:
+ if "numpy" not in str(datatype) and datatype != str:
raise TypeError("Attribute needs to be a Tango-supported numpy or str type, but has type \"%s\"" % (datatype,))
self.comms_annotation = comms_annotation # store data that can be used by the comms interface. not used by the wrapper itself
--
GitLab