From 1378f45e7077f8995c793ddd9caa74140a6c05a7 Mon Sep 17 00:00:00 2001 From: Juliano Murari Date: Thu, 19 Sep 2019 14:29:22 +0200 Subject: [PATCH 1/2] Add instant current axis attribute --- sardana_albaem/ctrl/Albaem2CoTiCtrl.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sardana_albaem/ctrl/Albaem2CoTiCtrl.py b/sardana_albaem/ctrl/Albaem2CoTiCtrl.py index 1ef5086..d3c652b 100644 --- a/sardana_albaem/ctrl/Albaem2CoTiCtrl.py +++ b/sardana_albaem/ctrl/Albaem2CoTiCtrl.py @@ -61,6 +61,12 @@ class Albaem2CoTiCtrl(CounterTimerController): Access: DataAccess.ReadWrite, }, + "InstantCurrent": { + Type: float, + Description: 'Channel instant current', + Memorize: NotMemorized, + Access: DataAccess.ReadOnly + }, "FORMULA": { Type: str, @@ -368,6 +374,9 @@ def GetExtraAttributePar(self, axis, name): elif val.lower() == 'on': ret = True return ret + elif name == 'instantcurrent': + cmd = 'CHAN{0:02d}:INSCurrent?'.format(axis) + return eval(self.sendCmd(cmd)) def SetExtraAttributePar(self, axis, name, value): if axis == 1: From 118642597c90a9d1d0575edbb28e1415b96d39b1 Mon Sep 17 00:00:00 2001 From: Juliano Murari Date: Thu, 19 Sep 2019 14:32:43 +0200 Subject: [PATCH 2/2] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f1f9c4b..6e62a24 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def main(): """Main method collecting all the parameters to setup.""" name = "sardana-albaem" - version = "0.0.6" + version = "0.0.7" description = "AlbaEM Sardana Controller"