remove support for declaring parameters/commands as accessibles

use parameters/commands for this

Change-Id: I41f68c7f65f0ea451e639092a44a8ff8f5710bfc
Reviewed-on: https://forge.frm2.tum.de/review/20275
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-03-28 17:46:46 +01:00
parent 568e214a91
commit 752f8f8093
9 changed files with 44 additions and 47 deletions

View File

@ -35,7 +35,7 @@ from secop.modules import Drivable, Override, Parameter, Readable
class Switch(Drivable):
"""switch it on or off....
"""
accessibles = {
parameters = {
'value': Override('current state (on or off)',
datatype=EnumType(on=1, off=0), default=0,
),
@ -97,7 +97,7 @@ class Switch(Drivable):
class MagneticField(Drivable):
"""a liquid magnet
"""
accessibles = {
parameters = {
'value': Override('current field in T',
unit='T', datatype=FloatRange(-15, 15), default=0,
),
@ -197,7 +197,7 @@ class MagneticField(Drivable):
class CoilTemp(Readable):
"""a coil temperature
"""
accessibles = {
parameters = {
'value': Override('Coil temperatur',
unit='K', datatype=FloatRange(), default=0,
),
@ -213,7 +213,7 @@ class CoilTemp(Readable):
class SampleTemp(Drivable):
"""a sample temperature
"""
accessibles = {
parameters = {
'value': Override('Sample temperature',
unit='K', datatype=FloatRange(), default=10,
),
@ -260,7 +260,7 @@ class Label(Readable):
of several subdevices. used for demoing connections between
modules.
"""
accessibles = {
parameters = {
'system': Parameter("Name of the magnet system",
datatype=StringType, export=False,
),
@ -305,7 +305,7 @@ class Label(Readable):
class DatatypesTest(Readable):
"""for demoing all datatypes
"""
accessibles = {
parameters = {
'enum': Parameter('enum', datatype=EnumType(boo=None, faar=None, z=9),
readonly=False, default=1),
'tupleof': Parameter('tuple of int, float and str',
@ -327,7 +327,7 @@ class DatatypesTest(Readable):
class ArrayTest(Readable):
accessibles = {
parameters = {
"x": Parameter('value', datatype=ArrayOf(FloatRange(), 0, 100000),
default = 100000 * [0]),
}

View File

@ -54,7 +54,7 @@ class Heater(Drivable):
class name indicates it to be some heating element,
but the implementation may do anything
"""
accessibles = {
parameters = {
'maxheaterpower': Parameter('maximum allowed heater power',
datatype=FloatRange(0, 100), unit='W',
),
@ -73,7 +73,7 @@ class Temp(Drivable):
class name indicates it to be some temperature controller,
but the implementation may do anything
"""
accessibles = {
parameters = {
'sensor': Parameter(
"Sensor number or calibration id",
datatype=StringType(