Migration to NIDAQmx python wrapper #8

Soungai00 · 2024-12-09T21:45:28Z

Plugin updated with NIDAQmx viewer based on NIDAQmx python wrapper.

For this first release with NI, Analog Input are coded and working with cDAQ & NI-USB devices.
Measurements available are current, voltages and temperatures:

voltages tested & working with cDAQ-9174 and NI-9205 module
temperatures tested and working with Thermocouples sensors plugged on NI-9211 module (still on cDAQ-9174)

.toml config files are used to get the configuration of the manip and scalable group parameter are created during init_detector to get the configurated analog inputs

Wrapper daqmxni as been implemented from nidaqmx library. Simple counter works. Other channels must be tested. Must add a "timer" to the counter.

….devices objects

…base

… config during init

…idaq_cethil_multimodule

loicguilmard

aren't those supposed to be DAQmx_legacy now ?

aurore-finco · 2025-01-21T17:07:50Z

src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmxni.py

+        self.level = level
+
+
+class Channel:


The Channel object exists also in the nidaqmx library (see doc here), with many child classes (AIChannel, AOChannel, etc.) just like we do. Shouldn't we rather use these?
I am not fully sure, as the nidaqmx objects require a task during initialization, we might need to rewrite a lot of code, but this would seem better.

After investigation it seems convenient to keep our channels. As you said the nidaqmx channel object require a task, and it doesn't really match the use of the param tree or the config files + modifying and deleting channels properly in a whole global task could easily become a mess so closing a task and opening a new one remains a clean way for update_task.

src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmxni.py

aurore-finco · 2025-01-21T17:14:02Z

src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmxni.py

+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+


Maybe we should specifiy somewhere that the DigitalChannels are not fully implemented and not tested yet.

aurore-finco · 2025-01-21T17:35:41Z

src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx.py

        self.channels = None
        self.clock_settings = None
        self.trigger_settings = None
        self.live = False


Where is self.controller initialized? Which object is it supposed to be?

self.controller is a DAQmx object (btw I'm renaming it NIDAQmx) which is supposed to be initialized either in the init_detector of the daq_NIDAQmx_Viewer.py for a detector or in the ini_stage of daq_NIDAQmx_Move.py for an actuator

aurore-finco · 2025-01-21T17:40:14Z

src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx_Move.py

+                else:
+                    self.controller = controller
+            else:
+                self.controller = 'A Nidaqmx task'


The controller should probably not be a string here.

Since I didn't implement it but only made a copy paste of the current one, i'm removing this file to be sure only working things are released.

aurore-finco

So only the DAQ_viewer 0D has been tested with the new nidaqmx version? I think that the DAQ_Move might not work at the moment.

…DAQmx_Move) to let previous PYDAQmx based-on daq_NIDAQmx.py reachable

loicguilmard · 2025-01-29T08:37:46Z

@seb5g I think we all agree now. If you're ok with the result, would you accept this PR ?
Basically, we cleaned up all the useless extra object using nidaq lib and tested the analog input while keeping the compatibility for previous users. We (with aurore team and jeremy) plan on having another PR/release for the counter and nidaq actuator module.

May be you want to test it against your system ?
May be it need a git tag to trigger the build ? not sure how you manage those.

seb5g · 2025-01-29T11:28:55Z

hatch_build.py

@@ -0,0 +1,10 @@
+from pathlib import Path
+from hatchling.metadata.plugin.interface import MetadataHookInterface
+from pymodaq_utils.resources.hatch_build_plugins import update_metadata_from_toml


If one use pyproject and hatch then one has to add pymodaq_utils in the project requirements. As only including pymodaq 4 will not require pymodaq_utils

It is already in the pyproject.toml in the following section:

[build-system] requires = [ "hatchling>=1.9.0", "hatch-vcs", "toml", "pymodaq_utils>=0.0.6", ]

Do you mean adding it in the dependencies of the project section such as below ?

dependencies = [ "pymodaq>=4.4", "pydaqmx", "nidaqmx", "aenum", "pymodaq_utils" ]

non you're right it is a build requirement... sorry

seb5g · 2025-01-29T11:30:59Z

@seb5g I think we all agree now. If you're ok with the result, would you accept this PR ? Basically, we cleaned up all the useless extra object using nidaq lib and tested the analog input while keeping the compatibility for previous users. We (with aurore team and jeremy) plan on having another PR/release for the counter and nidaq actuator module.

May be you want to test it against your system ? May be it need a git tag to trigger the build ? not sure how you manage those.

I saw one thing to modify in my quick review. I will accept the PR and then test on my stuff. I'll do other PR if need be.

seb5g · 2025-01-29T15:10:49Z

Hi there, version 1.0.0 using nidaqmx is online! Good job to everyone @Soungai00 @jerlfan @loicguilmard @aurore-finco and all other I may not know about ;-)

jerlfan and others added 29 commits November 17, 2023 17:12

new simple counter of all type

0f854b1

Update daq_0Dviewer_DAQmx_counter.py

5d37aa4

using nidaqmx

730c40d

adding the use of the nidaqmx module

b3b8991

replacing PyDAQmx by nidaqmx in daqmx-ni

a34f000

working version of wrapper daqmxni

feb7235

Wrapper daqmxni as been implemented from nidaqmx library. Simple counter works. Other channels must be tested. Must add a "timer" to the counter.

NIDAQmx structure

9919dee

New daq_viewer_NIDAQmx + wrapper modifs

ab58aea

code adapted to nidaqmx + live visu ok

2742e27

Reorder & update nidaqmx constants & variables

2ebd341

Clarify code

9193b7e

Remove old PyDAQMX based-on method

3631908

devices attributes not a list of string anymore but a list of nidaqmx…

a1989ae

….devices objects

Clarify code

4f7bf5d

PEP + syntax

daf959c

nidaqmx.task parameters

7d44cc5

PEP + syntax

31c5d6a

Callback method

612e403

PEP + syntax

697d4be

Optimizing plugin structure by separating Move & Viewer from NIDAQmx …

7a317b7

…base

Attributes & methods from inheritance

8288ab9

Main file reworked for callback tests

e0559a3

add config files .toml

f0e25f3

Fixed imports

7371774

Import config from .toml files

7ba5d55

Add use of toml files: config sequence + generates scalablegroup from…

91dbcfe

… config during init

Minor modifs (PEP, unused imports, info logged)

9d0b673

Clarify & optimize code + fix minors problems

186b66b

Update README

6782d28

loicguilmard mentioned this pull request Dec 10, 2024

Updating plugins using nidaqmx and not PyDAQmx #6

Open

Merge remote-tracking branch 'origin/nidaq_cethil_multimodule' into n…

a5e1839

…idaq_cethil_multimodule

loicguilmard suggested changes Jan 21, 2025

View reviewed changes

Typos in daq_NIDAQmx_Move.py

9094128

aurore-finco reviewed Jan 21, 2025

View reviewed changes

src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmxni.py Outdated Show resolved Hide resolved

aurore-finco reviewed Jan 21, 2025

View reviewed changes

src/pymodaq_plugins_daqmx/hardware/national_instruments/daqmxni.py Outdated Show resolved Hide resolved

aurore-finco reviewed Jan 21, 2025

View reviewed changes

aurore-finco approved these changes Jan 21, 2025

View reviewed changes

Soungai00 and others added 11 commits January 24, 2025 15:44

DAQ_NIDAQ_source enum replaced by nidaqmx ChannelType enum

f721cfd

README update

a2d9312

Renaming DAQmx object as NIDAQmx one

92e9744

README update

a17455c

Renaming new nidaqmx based-on codes (NIDAQmx_base, NIDAQmx_Viewer, NI…

34983c6

…DAQmx_Move) to let previous PYDAQmx based-on daq_NIDAQmx.py reachable

NIDAQmx_Move not implemented yet

056e4c8

Add Aurore's commit

2a90e30

NIDAQmx_Move not implemented yet

8d3cb70

Merge branch 'main' into nidaq_cethil_multimodule

b24efa8

UsageTypeCI added for future counter implementation

47d6e13

[completion]

662d2f4

loicguilmard approved these changes Jan 28, 2025

View reviewed changes

seb5g requested changes Jan 29, 2025

View reviewed changes

seb5g approved these changes Jan 29, 2025

View reviewed changes

seb5g merged commit 74e8ef0 into PyMoDAQ:main Jan 29, 2025
1 check passed

Soungai00 deleted the nidaq_cethil_multimodule branch January 30, 2025 09:01

Migration to NIDAQmx python wrapper #8

Migration to NIDAQmx python wrapper #8

Uh oh!

Conversation

Soungai00 commented Dec 9, 2024

Uh oh!

loicguilmard left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aurore-finco left a comment

Choose a reason for hiding this comment

Uh oh!

loicguilmard commented Jan 29, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

seb5g commented Jan 29, 2025

Uh oh!

Uh oh!

seb5g commented Jan 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants