Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0f854b1
new simple counter of all type
jerlfan Nov 17, 2023
5d37aa4
Update daq_0Dviewer_DAQmx_counter.py
jerlfan Nov 18, 2023
730c40d
using nidaqmx
jerlfan Nov 21, 2023
b3b8991
adding the use of the nidaqmx module
jerlfan Dec 7, 2023
a34f000
replacing PyDAQmx by nidaqmx in daqmx-ni
jerlfan Dec 8, 2023
feb7235
working version of wrapper daqmxni
jerlfan Dec 14, 2023
9919dee
NIDAQmx structure
Soungai00 Sep 17, 2024
ab58aea
New daq_viewer_NIDAQmx + wrapper modifs
Soungai00 Sep 19, 2024
2742e27
code adapted to nidaqmx + live visu ok
Soungai00 Sep 26, 2024
2ebd341
Reorder & update nidaqmx constants & variables
Soungai00 Dec 5, 2024
9193b7e
Clarify code
Soungai00 Dec 5, 2024
3631908
Remove old PyDAQMX based-on method
Soungai00 Dec 5, 2024
a1989ae
devices attributes not a list of string anymore but a list of nidaqmx…
Soungai00 Dec 5, 2024
4f7bf5d
Clarify code
Soungai00 Dec 5, 2024
daf959c
PEP + syntax
Soungai00 Dec 5, 2024
7d44cc5
nidaqmx.task parameters
Soungai00 Dec 5, 2024
31c5d6a
PEP + syntax
Soungai00 Dec 5, 2024
612e403
Callback method
Soungai00 Dec 5, 2024
697d4be
PEP + syntax
Soungai00 Dec 5, 2024
7a317b7
Optimizing plugin structure by separating Move & Viewer from NIDAQmx …
Soungai00 Dec 5, 2024
8288ab9
Attributes & methods from inheritance
Soungai00 Dec 5, 2024
e0559a3
Main file reworked for callback tests
Soungai00 Dec 5, 2024
f0e25f3
add config files .toml
Soungai00 Dec 6, 2024
7371774
Fixed imports
Soungai00 Dec 6, 2024
7ba5d55
Import config from .toml files
Soungai00 Dec 6, 2024
91dbcfe
Add use of toml files: config sequence + generates scalablegroup from…
Soungai00 Dec 9, 2024
9d0b673
Minor modifs (PEP, unused imports, info logged)
Soungai00 Dec 9, 2024
186b66b
Clarify & optimize code + fix minors problems
Soungai00 Dec 9, 2024
6782d28
Update README
Soungai00 Dec 9, 2024
46cf0ca
removed CustomEnum to use the ones from nidaq.constants
loicguilmard Dec 18, 2024
17d444d
migrated to pyproject.toml
loicguilmard Dec 18, 2024
ba2ec80
extended nidaqmx.constants : UsageTypeAI, Edge, TerminalConfiguration…
loicguilmard Dec 19, 2024
d916856
Using the extended nidaqmx.constants
loicguilmard Dec 19, 2024
0e4be2e
[Cleaning] aliasing task and System, using explicit enum.Input and PE…
loicguilmard Dec 19, 2024
974fbd1
[Cleaning] aliasing Device and typos
loicguilmard Dec 19, 2024
a964c7d
Fixes
loicguilmard Dec 19, 2024
d4731a9
using enums instead of hardcoded strings.
loicguilmard Dec 19, 2024
9797e14
Added DAQ_NIDAQ_source OD, 1D, Actuator
loicguilmard Dec 19, 2024
bf1df4b
enums typos and mix-ups
loicguilmard Dec 20, 2024
7db1596
Added aenum to dependencies
loicguilmard Dec 20, 2024
5469912
Merge pull request #1 from loicguilmard/nidaq_cethil_multimodule
Soungai00 Dec 21, 2024
004e910
Fix viewer & move double implementation
Soungai00 Jan 7, 2025
90c72b5
Remove use of deprecated .members() method
Soungai00 Jan 9, 2025
8ec8fe2
[Cleaning] Useless infos removed, spaces & main
Soungai00 Jan 10, 2025
750db1b
[Optimizing] nidaqmx enum constants in their simplest use + channels …
Soungai00 Jan 17, 2025
67ef2f8
unused or extra codes removed
Soungai00 Jan 21, 2025
6a03efc
PyDAQmx based-on Analog Input codes deprecated (use daq_0Dviewer_NIDA…
Soungai00 Jan 21, 2025
df14254
PyDAQmx based-on Analog Input codes deprecated (use daq_0Dviewer_NIDA…
Soungai00 Jan 21, 2025
a5e1839
Merge remote-tracking branch 'origin/nidaq_cethil_multimodule' into n…
Soungai00 Jan 21, 2025
9094128
Typos in daq_NIDAQmx_Move.py
aurore-finco Jan 21, 2025
f721cfd
DAQ_NIDAQ_source enum replaced by nidaqmx ChannelType enum
Soungai00 Jan 24, 2025
a2d9312
README update
Soungai00 Jan 24, 2025
92e9744
Renaming DAQmx object as NIDAQmx one
Soungai00 Jan 27, 2025
a17455c
README update
Soungai00 Jan 27, 2025
34983c6
Renaming new nidaqmx based-on codes (NIDAQmx_base, NIDAQmx_Viewer, NI…
Soungai00 Jan 27, 2025
056e4c8
NIDAQmx_Move not implemented yet
Soungai00 Jan 27, 2025
2a90e30
Add Aurore's commit
Soungai00 Jan 27, 2025
8d3cb70
NIDAQmx_Move not implemented yet
Soungai00 Jan 27, 2025
b24efa8
Merge branch 'main' into nidaq_cethil_multimodule
Soungai00 Jan 27, 2025
47d6e13
UsageTypeCI added for future counter implementation
Soungai00 Jan 27, 2025
662d2f4
[completion]
Soungai00 Jan 27, 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
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Contributors

* Amelie Jarnac
* Aurore Finco
* Sébastien Guerrero (sebastien.guerrero@insa-lyon.fr)

Instruments
===========
Expand All @@ -40,6 +41,6 @@ Viewer0D
++++++++

* **DAQmx_PLcounter**: Single photon counting

* **NIDAQmx**: For now (01/2025) Only Analog Input tested and working. (current-voltage-temperature measurements on cDAQ & DAQ-USB)


10 changes: 10 additions & 0 deletions hatch_build.py
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"
]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


here = Path(__file__).absolute().parent


class PluginInfoTomlHook(MetadataHookInterface):
def update(self, metadata: dict) -> None:
update_metadata_from_toml(metadata, here)
23 changes: 0 additions & 23 deletions plugin_info.toml

This file was deleted.

65 changes: 65 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[features] # defines the plugin features contained into this plugin
instruments = true # true if plugin contains instrument classes (else false, notice the lowercase for toml files)
extensions = false # true if plugins contains dashboard extensions
models = false # true if plugins contains pid models
h5exporters = false # true if plugin contains custom h5 file exporters
scanners = false # true if plugin contains custom scan layout (daq_scan extensions)

[urls]
package-url = 'https://github.com/PyMoDAQ/pymodaq_plugins_daqmx'

[project]
name = "pymodaq_plugins_daqmx"
description = 'Hardware plugins for PyMoDAQ using the NiDAQmx framework (nidaq wrapper)'
dependencies = [
"pymodaq>=4.4",
"pydaqmx",
"nidaqmx",
"aenum"
]

authors = [
{name = 'Sébastien Weber', email = 'sebastien.weber@cemes.fr'},
{name = 'Sébastien Guerrero', email = 'sebastien.guerrero@insa-lyon.fr'},
]
maintainers = [
{name = 'Sébastien Weber', email = 'sebastien.weber@cemes.fr'},
{name = 'Sébastien Guerrero', email = 'sebastien.guerrero@insa-lyon.fr'},
]

# nottodo: leave everything below as is!

dynamic = ["version", "urls", "entry-points"]
readme = "README.rst"
license = { file="LICENSE" }
requires-python = ">=3.8"

classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering :: Human Machine Interfaces",
"Topic :: Scientific/Engineering :: Visualization",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: User Interfaces",
]

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

[tool.hatch.metadata.hooks.custom]

[tool.hatch.version]
source = "vcs"

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import PyDAQmx


class DAQ_Move_DAQmx_MultipleScannerControl(DAQ_Move_base):
"""Plugin to control a piezo scanners with a NI card. This modules requires a clock channel to handle the
timing of the movement and display the position, and this clock channel is shared between the master and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import PyDAQmx


class DAQ_Move_DAQmx_ScannerControl(DAQ_Move_base):
"""Plugin to control a piezo scanner with a NI card. This modules requires a clock channel to handle the
timing of the movement and display the position. Avoid using several scanners (ie several analog outputs)
Expand Down

This file was deleted.

This file was deleted.

Loading