Skip to content

Commit a1011f2

Browse files
committed
Minor fixes on ADU100 and DataQ
- Fix second relay showing with ADU100 setup when update relay mode to Switch (one-wire) or Pump. - Fix DataQ not clearing variable names, units, types, and equations when emptying the fields. - Bump version to 2.9.14.beta
1 parent 780140c commit a1011f2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

inlinino/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy as np
99

1010

11-
__version__ = '2.9.13'
11+
__version__ = '2.9.14.beta'
1212

1313
# Setup Logger
1414
logging.basicConfig(level=logging.DEBUG)

inlinino/gui.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,8 @@ def act_activate_fields_for_adu_model(self):
802802
raise ValueError(f'Model {model} not supported.')
803803

804804
def act_adu_update_relay1_available(self):
805-
if self.combobox_relay0_mode.currentText() != 'Switch (two-wire)':
805+
if (self.combobox_relay0_mode.currentText() != 'Switch (two-wire)' and
806+
self.combobox_model.currentText() != 'ADU100'):
806807
self.checkbox_relay1_enabled.setEnabled(True)
807808
self.combobox_relay1_mode.setEnabled(True)
808809
else:
@@ -836,6 +837,8 @@ def act_save(self):
836837
value = getattr(self, f).text().strip()
837838
if not field_optional and not value:
838839
empty_fields.append(field_pretty_name)
840+
if self.cfg['module'] == 'dataq' and field_name.startswith('variable'):
841+
self.cfg[field_name] = []
839842
continue
840843
# Apply special formatting to specific variables
841844
try:
@@ -865,6 +868,8 @@ def act_save(self):
865868
value = getattr(self, f).toPlainText().strip()
866869
if not value:
867870
empty_fields.append(field_pretty_name)
871+
if self.cfg['module'] == 'dataq' and field_name.startswith('variable'):
872+
self.cfg[field_name] = []
868873
continue
869874
try:
870875
value = [v.strip() for v in value.split(',')]

0 commit comments

Comments
 (0)