From cf6c3d3a1258d9eb9d8e04adfc85f64232ac3846 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 'illegal state transition' bug and off->initialise
state bug
---
devices/clients/test_client.py | 6 ++++++
devices/src/attribute_wrapper.py | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/devices/clients/test_client.py b/devices/clients/test_client.py
index f3663be5a..4227ac292 100644
--- a/devices/clients/test_client.py
+++ b/devices/clients/test_client.py
@@ -1,9 +1,12 @@
from src.comms_client import *
+<<<<<<< HEAD
<<<<<<< HEAD
import os
=======
>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
+=======
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
# <class 'numpy.bool_'>
@@ -32,9 +35,12 @@ class example_client(CommClient):
"""
this function provides a location for the code neccecary to connect to the client
"""
+<<<<<<< HEAD
<<<<<<< HEAD
self.streams.debug_stream(os.path.dirname(os.path.abspath(__file__)))
=======
+=======
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
self.streams.debug_stream("the example client doesn't actually connect to anything silly")
diff --git a/devices/src/attribute_wrapper.py b/devices/src/attribute_wrapper.py
index 8b62378b2..039849c32 100644
--- a/devices/src/attribute_wrapper.py
+++ b/devices/src/attribute_wrapper.py
@@ -11,6 +11,7 @@ logger = logging.getLogger()
class attribute_wrapper(attribute):
"""
+<<<<<<< HEAD
<<<<<<< HEAD
Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
"""
@@ -25,6 +26,16 @@ class attribute_wrapper(attribute):
dims: dimensions of the
init_value: value
"""
+=======
+ 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.
+ """
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
=======
Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
"""
--
GitLab