Skip to content

Commit

Permalink
Merge pull request #731 from lnls-sirius/update-rf-pinsw
Browse files Browse the repository at this point in the history
Remove deprecated rule in PinSw in SI RF GUI
  • Loading branch information
anacso17 authored Feb 17, 2025
2 parents c7814b6 + 610f8fd commit c66c92b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pyqt-apps/siriushla/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.0
1.7.0
11 changes: 6 additions & 5 deletions pyqt-apps/siriushla/as_rf_control/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -1604,11 +1604,12 @@ def _create_ssa_wid(self, lay_amp, row, chs_dict):
if self.section == 'SI':
pre_drive_ch = pre_drive_ch['Value']
pre_drive_ch = self.prefix + pre_drive_ch
rules = (
'[{"name": "EnblRule", "property": "Enable", "expression":' +
'"ch[0] < ' + str(chs_dict['PreDriveThrs']) + '", "channels":' +
'[{"channel": "'+ pre_drive_ch + '", "trigger": true}]}]')
bt_pinsw.pb_on.rules = rules
if self.section != 'SI':
rules = (
'[{"name": "EnblRule", "property": "Enable", "expression":' +
'"ch[0] < ' + str(chs_dict['PreDriveThrs']) + '", "channels":' +
'[{"channel": "'+ pre_drive_ch + '", "trigger": true}]}]')
bt_pinsw.pb_on.rules = rules
led_pinsw = SiriusLedState(self, self.prefix+chs_dict['PinSw']['Mon'])
lay_amp.addLayout(self._create_vlay(bt_pinsw, led_pinsw), row, 7)

Expand Down

0 comments on commit c66c92b

Please sign in to comment.