Skip to content

Feature/enum access and versioning #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seb5g merged 2 commits into from
Jan 31, 2025
Merged

Feature/enum access and versioning #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
159806e
added enum access
seb5g Jan 31, 2025
733f8ef
remove old style version
seb5g Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/pymodaq_plugins_daqmx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
12 changes: 6 additions & 6 deletions src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(', ')
Expand Down
Loading