From f6d8ced3d83bc45dd71df90c1711152d5817b974 Mon Sep 17 00:00:00 2001 From: Carlos Falcon Date: Wed, 11 Aug 2021 08:57:06 +0200 Subject: [PATCH] Adapt to Sardana v3 Adapt the code to not use the long time ago deprecated API. Done by zreszela PR --- sardana_linkam/ctrl/LinkamTST350MotorCtrl.py | 11 ++++++----- sardana_linkam/ctrl/LinkamTST350TempMotorCtrl.py | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sardana_linkam/ctrl/LinkamTST350MotorCtrl.py b/sardana_linkam/ctrl/LinkamTST350MotorCtrl.py index 26f9b4f..4f0ad63 100755 --- a/sardana_linkam/ctrl/LinkamTST350MotorCtrl.py +++ b/sardana_linkam/ctrl/LinkamTST350MotorCtrl.py @@ -30,7 +30,8 @@ import PyTango import time -from sardana.pool.controller import MotorController +from sardana.pool.controller import (MotorController, Type, Description, + DefaultValue) from sardana import State @@ -49,11 +50,11 @@ class LinkamTST350MotorCtrl(MotorController): MaxDevice = 3 AXIS_ATTR = ['PositionX', 'PositionY', 'PositionZ'] - class_prop = {'DeviceName': - {'Type': 'PyTango.DevString', - 'Description': 'Device name of the Smaract MCS DS'}} + ctrl_properties = {'DeviceName': + {Type: 'str', + Description: 'Device name of the Smaract MCS DS'}} - ctrl_extra_attributes = {} + axis_attributes = {} def __init__(self, inst, props, *args, **kwargs): diff --git a/sardana_linkam/ctrl/LinkamTST350TempMotorCtrl.py b/sardana_linkam/ctrl/LinkamTST350TempMotorCtrl.py index ec885d9..3fece98 100755 --- a/sardana_linkam/ctrl/LinkamTST350TempMotorCtrl.py +++ b/sardana_linkam/ctrl/LinkamTST350TempMotorCtrl.py @@ -52,8 +52,8 @@ class LinkamTST350TempMotorCtrl(MotorController): MaxDevice = 1 AXIS_ATTR = 'Temperature' ctrl_properties = {'DeviceName': - {'Type': 'PyTango.DevString', - 'Description': 'Device name of the Linkam TST350'}} + {Type: 'str', + Description: 'Device name of the Linkam TST350'}} axis_attributes = { "tolerance" : {