-
Notifications
You must be signed in to change notification settings - Fork 10
Migration to NIDAQmx python wrapper #8
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.
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
Merged
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 5d37aa4
Update daq_0Dviewer_DAQmx_counter.py
jerlfan 730c40d
using nidaqmx
jerlfan b3b8991
adding the use of the nidaqmx module
jerlfan a34f000
replacing PyDAQmx by nidaqmx in daqmx-ni
jerlfan feb7235
working version of wrapper daqmxni
jerlfan 9919dee
NIDAQmx structure
Soungai00 ab58aea
New daq_viewer_NIDAQmx + wrapper modifs
Soungai00 2742e27
code adapted to nidaqmx + live visu ok
Soungai00 2ebd341
Reorder & update nidaqmx constants & variables
Soungai00 9193b7e
Clarify code
Soungai00 3631908
Remove old PyDAQMX based-on method
Soungai00 a1989ae
devices attributes not a list of string anymore but a list of nidaqmx…
Soungai00 4f7bf5d
Clarify code
Soungai00 daf959c
PEP + syntax
Soungai00 7d44cc5
nidaqmx.task parameters
Soungai00 31c5d6a
PEP + syntax
Soungai00 612e403
Callback method
Soungai00 697d4be
PEP + syntax
Soungai00 7a317b7
Optimizing plugin structure by separating Move & Viewer from NIDAQmx …
Soungai00 8288ab9
Attributes & methods from inheritance
Soungai00 e0559a3
Main file reworked for callback tests
Soungai00 f0e25f3
add config files .toml
Soungai00 7371774
Fixed imports
Soungai00 7ba5d55
Import config from .toml files
Soungai00 91dbcfe
Add use of toml files: config sequence + generates scalablegroup from…
Soungai00 9d0b673
Minor modifs (PEP, unused imports, info logged)
Soungai00 186b66b
Clarify & optimize code + fix minors problems
Soungai00 6782d28
Update README
Soungai00 46cf0ca
removed CustomEnum to use the ones from nidaq.constants
loicguilmard 17d444d
migrated to pyproject.toml
loicguilmard ba2ec80
extended nidaqmx.constants : UsageTypeAI, Edge, TerminalConfiguration…
loicguilmard d916856
Using the extended nidaqmx.constants
loicguilmard 0e4be2e
[Cleaning] aliasing task and System, using explicit enum.Input and PE…
loicguilmard 974fbd1
[Cleaning] aliasing Device and typos
loicguilmard a964c7d
Fixes
loicguilmard d4731a9
using enums instead of hardcoded strings.
loicguilmard 9797e14
Added DAQ_NIDAQ_source OD, 1D, Actuator
loicguilmard bf1df4b
enums typos and mix-ups
loicguilmard 7db1596
Added aenum to dependencies
loicguilmard 5469912
Merge pull request #1 from loicguilmard/nidaq_cethil_multimodule
Soungai00 004e910
Fix viewer & move double implementation
Soungai00 90c72b5
Remove use of deprecated .members() method
Soungai00 8ec8fe2
[Cleaning] Useless infos removed, spaces & main
Soungai00 750db1b
[Optimizing] nidaqmx enum constants in their simplest use + channels …
Soungai00 67ef2f8
unused or extra codes removed
Soungai00 6a03efc
PyDAQmx based-on Analog Input codes deprecated (use daq_0Dviewer_NIDA…
Soungai00 df14254
PyDAQmx based-on Analog Input codes deprecated (use daq_0Dviewer_NIDA…
Soungai00 a5e1839
Merge remote-tracking branch 'origin/nidaq_cethil_multimodule' into n…
Soungai00 9094128
Typos in daq_NIDAQmx_Move.py
aurore-finco f721cfd
DAQ_NIDAQ_source enum replaced by nidaqmx ChannelType enum
Soungai00 a2d9312
README update
Soungai00 92e9744
Renaming DAQmx object as NIDAQmx one
Soungai00 a17455c
README update
Soungai00 34983c6
Renaming new nidaqmx based-on codes (NIDAQmx_base, NIDAQmx_Viewer, NI…
Soungai00 056e4c8
NIDAQmx_Move not implemented yet
Soungai00 2a90e30
Add Aurore's commit
Soungai00 8d3cb70
NIDAQmx_Move not implemented yet
Soungai00 b24efa8
Merge branch 'main' into nidaq_cethil_multimodule
Soungai00 47d6e13
UsageTypeCI added for future counter implementation
Soungai00 662d2f4
[completion]
Soungai00 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
||
| here = Path(__file__).absolute().parent | ||
|
|
||
|
|
||
| class PluginInfoTomlHook(MetadataHookInterface): | ||
| def update(self, metadata: dict) -> None: | ||
| update_metadata_from_toml(metadata, here) | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmx.py
This file was deleted.
Oops, something went wrong.
168 changes: 0 additions & 168 deletions
168
src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmxAI.py
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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:
Do you mean adding it in the dependencies of the project section such as below ?
There was a problem hiding this comment.
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