Skip to content

Clean up NIDAQMX_ENABLE_WAVEFORM_SUPPORT usages in nidaqmx examples #187

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
mikeprosserni merged 2 commits into from
Dec 18, 2025
Merged

Clean up NIDAQMX_ENABLE_WAVEFORM_SUPPORT usages in nidaqmx examples #187

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
ee97ddc
nidaqmx 1.4.0-dev2
Dec 18, 2025
e839ce1
remove NIDAQMX_ENABLE_WAVEFORM_SUPPORT feature toggle
Dec 18, 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
12 changes: 5 additions & 7 deletions examples/nidaqmx/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
"""Data acquisition script that continuously acquires analog input data."""

import os
import time
from pathlib import Path

os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1"
import nidaqmx # noqa: E402 # Must import after setting os environment variable
import nidaqmx.system # noqa: E402
from nidaqmx.constants import ( # noqa: E402
import nidaqmx
import nidaqmx.system
from nidaqmx.constants import (
AcquisitionType,
CurrentShuntResistorLocation,
CurrentUnits,
Expand All @@ -19,9 +17,9 @@
TerminalConfiguration,
UsageTypeAI,
)
from nidaqmx.errors import DaqError # noqa: E402
from nidaqmx.errors import DaqError

import nipanel # noqa: E402
import nipanel

panel_script_path = Path(__file__).with_name("nidaqmx_analog_input_filtering_panel.py")
panel = nipanel.create_streamlit_panel(panel_script_path)
Expand Down
22 changes: 10 additions & 12 deletions examples/nidaqmx/nidaqmx_analog_output_voltage/nidaqmx_analog_output_voltage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
"""Data acquisition script that continuously generates analog output data."""

import os
import time
from pathlib import Path

os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1"
import hightime as ht # noqa: E402
import nidaqmx # noqa: E402 # Must import after setting os environment variable
import nidaqmx.stream_writers # noqa: E402
import nidaqmx.system # noqa: E402
import numpy as np # noqa: E402
from nidaqmx.constants import AcquisitionType, Edge, UsageTypeAO # noqa: E402
from nidaqmx.errors import DaqError # noqa: E402
from nitypes.waveform import AnalogWaveform, SampleIntervalMode, Timing # noqa: E402

import nipanel # noqa: E402
import hightime as ht
import nidaqmx
import nidaqmx.stream_writers
import nidaqmx.system
import numpy as np
from nidaqmx.constants import AcquisitionType, Edge, UsageTypeAO
from nidaqmx.errors import DaqError
from nitypes.waveform import AnalogWaveform, SampleIntervalMode, Timing

import nipanel

panel_script_path = Path(__file__).with_name("nidaqmx_analog_output_voltage_panel.py")
panel = nipanel.create_streamlit_panel(panel_script_path)
Expand Down
16 changes: 7 additions & 9 deletions examples/nidaqmx/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"""Data acquisition script that continuously acquires analog input data."""

import os
import time
from pathlib import Path
from typing import cast

os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1"
import nidaqmx # noqa: E402 # Must import after setting os environment variable
import nidaqmx.system # noqa: E402
import numpy as np # noqa: E402
from nidaqmx.constants import ( # noqa: E402
import nidaqmx
import nidaqmx.system
import numpy as np
from nidaqmx.constants import (
AcquisitionType,
CJCSource,
LoggingMode,
Expand All @@ -19,10 +17,10 @@
ThermocoupleType,
UsageTypeAI,
)
from nidaqmx.errors import DaqError # noqa: E402
from nitypes.waveform import AnalogWaveform # noqa: E402
from nidaqmx.errors import DaqError
from nitypes.waveform import AnalogWaveform

import nipanel # noqa: E402
import nipanel

panel_script_path = Path(__file__).with_name("nidaqmx_continuous_analog_input_panel.py")
panel = nipanel.create_streamlit_panel(panel_script_path)
Expand Down
12 changes: 6 additions & 6 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ optional = true
[tool.poetry.group.examples.dependencies]
streamlit-echarts = ">=0.4.0"
extra-streamlit-components = "^0.1.80"
nidaqmx = { version = ">=1.3.0-dev0", allow-prereleases = true }
nidaqmx = { version = ">=1.4.0-dev2", allow-prereleases = true }
niscope = "^1.4.9"

[build-system]
Expand Down
Loading