Merge pull request #1092 from lnls-sirius/update-orbintlk-evg

Adapt orbit interlock IOC to new EVG IOC version
lnls-sirius · Jun 18, 2024 · 4891a16 · 4891a16
2 parents d77c2dd + 2d05fc3
commit 4891a16
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/siriuspy/requirements.txt b/siriuspy/requirements.txt
@@ -1,7 +1,7 @@
 aiohttp>=3.7.4
 bottleneck>=1.3.2
 mathphys
-numpy>=1.18
+numpy<=1.23
 pyepics>=3.4.0
 python-dateutil>=2.8.1
 requests>=2.22.0

diff --git a/siriuspy/siriuspy/orbintlk/csdev.py b/siriuspy/siriuspy/orbintlk/csdev.py
@@ -82,12 +82,12 @@ class Const(_csdev.Const):
             ('WidthRaw-SP', 6))),
         ('SI-13C4:TI-DCCT-PsMtm', (
             ('Src-Sel', 0),
-            ('State-Sel', 1),
+            ('State-Sel', 0),
             ('Polarity-Sel', 0),
             ('Log-Sel', 1))),
         ('SI-14C4:TI-DCCT-PsMtm', (
             ('Src-Sel', 0),
-            ('State-Sel', 1),
+            ('State-Sel', 0),
             ('Polarity-Sel', 0),
             ('Log-Sel', 1))),
     ]

diff --git a/siriuspy/siriuspy/orbintlk/main.py b/siriuspy/siriuspy/orbintlk/main.py
@@ -75,7 +75,7 @@ def __init__(self, tests=False):
         # # EVG
         self._evg_dev = _EVG(props2init=[
             'IntlkCtrlEnbl-Sel', 'IntlkCtrlEnbl-Sts',
-            'IntlkCtrlRst-Sel', 'IntlkCtrlRst-Sts',
+            'IntlkCtrlRst-Cmd',
             'IntlkCtrlRepeat-Sel', 'IntlkCtrlRepeat-Sts',
             'IntlkCtrlRepeatTime-SP', 'IntlkCtrlRepeatTime-RB',
             'IntlkTbl0to15-Sel', 'IntlkTbl0to15-Sts',
@@ -776,7 +776,7 @@ def cmd_reset(self, state, value=None):
 
         # if it is a global reset, reset EVG
         if state == 'all':
-            self._evg_dev['IntlkCtrlRst-Sel'] = 1
+            self._evg_dev['IntlkCtrlRst-Cmd'] = 1
             self._update_log('Sent reset EVG interlock flag.')
 
         return True