From c2168cccc53c6a31f4c6dab2b368766f6d7cd5fb Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 17 Feb 2025 14:24:16 -0300 Subject: [PATCH 1/2] RF.ENH: remove rule in PinSw for SI --- pyqt-apps/siriushla/as_rf_control/control.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyqt-apps/siriushla/as_rf_control/control.py b/pyqt-apps/siriushla/as_rf_control/control.py index f577c2c38..b08f10c6e 100644 --- a/pyqt-apps/siriushla/as_rf_control/control.py +++ b/pyqt-apps/siriushla/as_rf_control/control.py @@ -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) From 610f8fdf63be74cde532d323d5971db7748194c1 Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 17 Feb 2025 14:24:41 -0300 Subject: [PATCH 2/2] Update version to 1.7.0 --- pyqt-apps/siriushla/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqt-apps/siriushla/VERSION b/pyqt-apps/siriushla/VERSION index dc1e644a1..bd8bf882d 100644 --- a/pyqt-apps/siriushla/VERSION +++ b/pyqt-apps/siriushla/VERSION @@ -1 +1 @@ -1.6.0 +1.7.0