linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change name of read_hw_status method in sequencer mixin

Browse Source 
change name to 'readHwStatus'
needed after commit "check for bad read* and write_* methods"

Change-Id: I27467aa2a3a3bb0db5f418c99f2d2065390a190a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27394
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2022-01-10 19:55:02 +01:00
parent 9b38db7706
commit 2ef0da68e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secop/lib/sequence.py
View File

@ -137,8 +137,8 @@ class SequencerMixin:
if self._seq_fault_on_stop: if self._seq_fault_on_stop:
return self.Status.ERROR, self._seq_stopped return self.Status.ERROR, self._seq_stopped
return self.Status.WARN, self._seq_stopped return self.Status.WARN, self._seq_stopped
if hasattr(self, 'read_hw_status'): if hasattr(self, 'readHwStatus'):
return self.read_hw_status() return self.readHwStatus()
return self.Status.IDLE, '' return self.Status.IDLE, ''
def stop(self): def stop(self):

4
secop_mlz/amagnet.py
View File

@ -137,7 +137,7 @@ class GarfieldMagnet(SequencerMixin, Drivable):
'_current2field polynome not monotonic!') '_current2field polynome not monotonic!')
def initModule(self): def initModule(self):
super(GarfieldMagnet, self).initModule() super().initModule()
self._enable = self.DISPATCHER.get_module(self.subdev_enable) self._enable = self.DISPATCHER.get_module(self.subdev_enable)
self._symmetry = self.DISPATCHER.get_module(self.subdev_symmetry) self._symmetry = self.DISPATCHER.get_module(self.subdev_symmetry)
self._polswitch = self.DISPATCHER.get_module(self.subdev_polswitch) self._polswitch = self.DISPATCHER.get_module(self.subdev_polswitch)
@ -220,7 +220,7 @@ class GarfieldMagnet(SequencerMixin, Drivable):
self._currentsource.read_value() * self._currentsource.read_value() *
self._get_field_polarity()) self._get_field_polarity())
def read_hw_status(self): def readHwStatus(self):
# called from SequencerMixin.read_status if no sequence is running # called from SequencerMixin.read_status if no sequence is running
if self._enable.value == 'Off': if self._enable.value == 'Off':
return self.Status.WARN, 'Disabled' return self.Status.WARN, 'Disabled'