From 159806ec840b38e44bc0dadf1b651d7b1a18462c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Weber?= Date: Fri, 31 Jan 2025 16:29:29 +0100 Subject: [PATCH 1/2] added enum access --- .../hardware/national_instruments/daqmx.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmx.py b/src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmx.py index 3e1f3f1..7b43c41 100644 --- a/src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmx.py +++ b/src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmx.py @@ -341,17 +341,17 @@ def get_NIDAQ_channels(cls, devices=None, source_type=None): if not not devices: for device in devices: for source in source_type: - if source == DAQ_NIDAQ_source['Analog_Input'].name: # analog input + if source == DAQ_NIDAQ_source.Analog_Input.name: # analog input string = try_string_buffer(PyDAQmx.DAQmxGetDevAIPhysicalChans, device) - elif source == DAQ_NIDAQ_source['Counter'].name: # counter + elif source == DAQ_NIDAQ_source.Counter.name: # counter string = try_string_buffer(PyDAQmx.DAQmxGetDevCIPhysicalChans, device) - elif source == DAQ_NIDAQ_source['Analog_Output'].name: # analog output + elif source == DAQ_NIDAQ_source.Analog_Output.name: # analog output string = try_string_buffer(PyDAQmx.DAQmxGetDevAOPhysicalChans, device) - elif source == DAQ_NIDAQ_source['Digital_Output'].name: # digital output + elif source == DAQ_NIDAQ_source.Digital_Output.name: # digital output string = try_string_buffer(PyDAQmx.DAQmxGetDevDOLines, device) - elif source == DAQ_NIDAQ_source['Digital_Input'].name: # digital output + elif source == DAQ_NIDAQ_source.Digital_Input.name: # digital output string = try_string_buffer(PyDAQmx.DAQmxGetDevDILines, device) - elif source == DAQ_NIDAQ_source['Terminals'].name: # digital output + elif source == DAQ_NIDAQ_source.Terminals.name: # digital output string = try_string_buffer(PyDAQmx.DAQmxGetDevTerminals, device) channels = string.split(', ') From 733f8ef8e3f3f21322ea255399856e6616c2163f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Weber?= Date: Fri, 31 Jan 2025 16:29:38 +0100 Subject: [PATCH 2/2] remove old style version --- src/pymodaq_plugins_daqmx/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pymodaq_plugins_daqmx/__init__.py b/src/pymodaq_plugins_daqmx/__init__.py index ca051e5..62ada89 100644 --- a/src/pymodaq_plugins_daqmx/__init__.py +++ b/src/pymodaq_plugins_daqmx/__init__.py @@ -4,5 +4,3 @@ from .utils import Config config = Config() -with open(str(Path(__file__).parent.joinpath('resources/VERSION')), 'r') as fvers: - __version__ = fvers.read().strip()