Skip to content

Commit f6a7677

Browse files
texasaggie97-zzmarcoskirsch
authored andcommitted
Internal/add nidmm (#970)
* Enable nidmm build * config_addon.py is for module_version only (so far) * Remove all addon information * Update generated metadata from hapigen * Update generated files * Don't use numpy 1.16.x - broken on pypy * Don't use quotes * Update metadata based on chanes in extraction * Update generated files
1 parent 2167adf commit f6a7677

16 files changed

+5858
-6646
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
ALL_DRIVERS := nifake nimodinst
2+
ALL_DRIVERS := nifake nimodinst nidmm
33
DRIVERS ?= $(ALL_DRIVERS)
44

55
ROOT_DIR := $(abspath .)

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ NI-DMM Python API Status
109109
+-------------------------------+----------------------+
110110
| NI-DMM (nidmm) | |
111111
+===============================+======================+
112-
| Driver Version Tested Against | 18.1.0 |
112+
| Driver Version Tested Against | 19.1.0d11 |
113113
+-------------------------------+----------------------+
114114
| PyPI Version | |nidmmLatestVersion| |
115115
+-------------------------------+----------------------+

docs/nidmm/class.rst

+95-164
Large diffs are not rendered by default.

docs/nidmm/status.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ NI-DMM Python API Status
55
+-------------------------------+----------------------+
66
| NI-DMM (nidmm) | |
77
+===============================+======================+
8-
| Driver Version Tested Against | 18.1.0 |
8+
| Driver Version Tested Against | 19.1.0d11 |
99
+-------------------------------+----------------------+
1010
| PyPI Version | |nidmmLatestVersion| |
1111
+-------------------------------+----------------------+

generated/nidmm/session.py

+24-24
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class _SessionBase(object):
163163
The NI 4050 and NI 4060 are not supported.
164164
'''
165165
dc_bias = _attributes.AttributeViInt32(1150053)
166-
'''Type: bool
166+
'''Type: int
167167
168168
For the NI 4072 only, controls the available DC bias for capacitance measurements.
169169
'''
@@ -257,7 +257,7 @@ class _SessionBase(object):
257257
The NI 4050 and NI 4060 are not supported.
258258
'''
259259
offset_comp_ohms = _attributes.AttributeViInt32(1150023)
260-
'''Type: bool
260+
'''Type: int
261261
262262
For the NI 4070/4071/4072 only, enables or disables offset compensated ohms.
263263
'''
@@ -1078,7 +1078,7 @@ def __init__(self, resource_name, id_query=False, reset_device=False, options={}
10781078
| Contains the **resource_name** of the device to initialize. The
10791079
**resource_name** is assigned in Measurement & Automation Explorer
10801080
(MAX). Refer to `Related
1081-
Documentation <related_documentation>`__
1081+
Documentation <REPLACE_DRIVER_SPECIFIC_URL_1(related_documentation)>`__
10821082
for the *NI Digital Multimeters Getting Started Guide* for more
10831083
information about configuring and testing the DMM in MAX.
10841084
| Valid Syntax:
@@ -1214,7 +1214,7 @@ def configure_measurement_absolute(self, measurement_function, range, resolution
12141214
value that you are measuring. For example, you must type in 10 V if you
12151215
are measuring 9 V. **range** values are coerced up to the closest input
12161216
**range**. Refer to the `Devices
1217-
Overview <devices>`__ for a list of valid
1217+
Overview <REPLACE_DRIVER_SPECIFIC_URL_1(devices)>`__ for a list of valid
12181218
ranges. The driver sets range to this value. The default is
12191219
0.02 V.
12201220
@@ -1281,7 +1281,7 @@ def configure_measurement_digits(self, measurement_function, range, resolution_d
12811281
that you are measuring. For example, you must type in 10 V if you are
12821282
measuring 9 V. range values are coerced up to the closest input range.
12831283
Refer to the `Devices
1284-
Overview <devices>`__ for a list of valid
1284+
Overview <REPLACE_DRIVER_SPECIFIC_URL_1(devices)>`__ for a list of valid
12851285
ranges. The driver sets range to this value. The default is
12861286
0.02 V.
12871287
@@ -1301,7 +1301,7 @@ def configure_measurement_digits(self, measurement_function, range, resolution_d
13011301
One or more of the referenced values are not in the Python API for this driver. Enums that only define values, or represent True/False, have been removed.
13021302
13031303
resolution_digits (float): Specifies the resolution of the measurement in digits. The driver sets
1304-
the `Devices Overview <devices>`__ for a
1304+
the `Devices Overview <REPLACE_DRIVER_SPECIFIC_URL_1(devices)>`__ for a
13051305
list of valid ranges. The driver sets resolution_digits
13061306
property to this value. The PXIe-4080/4081/4082 uses the resolution you
13071307
specify. The NI 4065 and NI 4070/4071/4072 ignore this parameter when
@@ -1339,9 +1339,9 @@ def configure_multi_point(self, trigger_count, sample_count, sample_trigger=enum
13391339
For continuous acquisitions, set trigger_count or
13401340
sample_count to zero. For more information, refer to
13411341
`Multiple Point
1342-
Acquisitions <multi_point>`__,
1343-
`Triggering <trigger>`__, and `Using
1344-
Switches <switch_selection>`__.
1342+
Acquisitions <REPLACE_DRIVER_SPECIFIC_URL_1(multi_point)>`__,
1343+
`Triggering <REPLACE_DRIVER_SPECIFIC_URL_1(trigger)>`__, and `Using
1344+
Switches <REPLACE_DRIVER_SPECIFIC_URL_1(switch_selection)>`__.
13451345
13461346
Args:
13471347
trigger_count (int): Sets the number of triggers you want the DMM to receive before returning
@@ -1359,7 +1359,7 @@ def configure_multi_point(self, trigger_count, sample_count, sample_trigger=enum
13591359
Note:
13601360
To determine which values are supported by each device, refer to the
13611361
`LabWindows/CVI Trigger
1362-
Routing <cvitrigger_routing>`__ section.
1362+
Routing <REPLACE_DRIVER_SPECIFIC_URL_1(cvitrigger_routing)>`__ section.
13631363
13641364
sample_interval (float in seconds or datetime.timedelta): Sets the amount of time in seconds the DMM waits between measurement
13651365
cycles. The driver sets sample_interval to this value.
@@ -1552,8 +1552,8 @@ def configure_trigger(self, trigger_source, trigger_delay=datetime.timedelta(sec
15521552
r'''configure_trigger
15531553
15541554
Configures the DMM **Trigger_Source** and **Trigger_Delay**. Refer to
1555-
`Triggering <trigger>`__ and `Using
1556-
Switches <switch_selection>`__ for more
1555+
`Triggering <REPLACE_DRIVER_SPECIFIC_URL_1(trigger)>`__ and `Using
1556+
Switches <REPLACE_DRIVER_SPECIFIC_URL_1(switch_selection)>`__ for more
15571557
information.
15581558
15591559
Args:
@@ -1565,7 +1565,7 @@ def configure_trigger(self, trigger_source, trigger_delay=datetime.timedelta(sec
15651565
Note:
15661566
To determine which values are supported by each device, refer to the
15671567
`LabWindows/CVI Trigger
1568-
Routing <cvitrigger_routing>`__ section.
1568+
Routing <REPLACE_DRIVER_SPECIFIC_URL_1(cvitrigger_routing)>`__ section.
15691569
15701570
trigger_delay (float in seconds or datetime.timedelta): Specifies the time that the DMM waits after it has received a trigger
15711571
before taking a measurement. The driver sets the
@@ -1616,7 +1616,7 @@ def configure_waveform_acquisition(self, measurement_function, range, rate, wave
16161616
closest input **range**. The default is 10.0.
16171617
16181618
For valid ranges refer to the topics in
1619-
`Devices <devices>`__.
1619+
`Devices <REPLACE_DRIVER_SPECIFIC_URL_1(devices)>`__.
16201620
16211621
Auto-ranging is not supported during waveform acquisitions.
16221622
@@ -1633,7 +1633,7 @@ def configure_waveform_acquisition(self, measurement_function, range, rate, wave
16331633
16341634
To calculate the maximum and minimum number of waveform points that you
16351635
can acquire in one acquisition, refer to the `Waveform Acquisition
1636-
Measurement Cycle <waveform_cycle>`__.
1636+
Measurement Cycle <REPLACE_DRIVER_SPECIFIC_URL_1(waveform_cycle)>`__.
16371637
16381638
The default value is 500.
16391639
@@ -1695,10 +1695,10 @@ def export_attribute_configuration_buffer(self):
16951695
**Related Topics:**
16961696
16971697
`Using Properties and Properties with
1698-
NI‑DMM <properties>`__
1698+
NI‑DMM <REPLACE_DRIVER_SPECIFIC_URL_1(properties)>`__
16991699
17001700
`Setting Properties Before Reading
1701-
Properties <setting_before_reading_attributes>`__
1701+
Properties <REPLACE_DRIVER_SPECIFIC_URL_1(setting_before_reading_attributes)>`__
17021702
17031703
Note: Not supported on the PCMCIA‑4050 or the PXI/PCI‑4060.
17041704
'''
@@ -1747,10 +1747,10 @@ def export_attribute_configuration_file(self, file_path):
17471747
**Related Topics:**
17481748
17491749
`Using Properties and Properties with
1750-
NI‑DMM <properties>`__
1750+
NI‑DMM <REPLACE_DRIVER_SPECIFIC_URL_1(properties)>`__
17511751
17521752
`Setting Properties Before Reading
1753-
Properties <setting_before_reading_attributes>`__
1753+
Properties <REPLACE_DRIVER_SPECIFIC_URL_1(setting_before_reading_attributes)>`__
17541754
17551755
Note: Not supported on the PCMCIA‑4050 or the PXI/PCI‑4060.
17561756
@@ -2164,10 +2164,10 @@ def import_attribute_configuration_buffer(self, configuration):
21642164
**Related Topics:**
21652165
21662166
`Using Properties and Properties with
2167-
NI‑DMM <properties>`__
2167+
NI‑DMM <REPLACE_DRIVER_SPECIFIC_URL_1(properties)>`__
21682168
21692169
`Setting Properties Before Reading
2170-
Properties <setting_before_reading_attributes>`__
2170+
Properties <REPLACE_DRIVER_SPECIFIC_URL_1(setting_before_reading_attributes)>`__
21712171
21722172
Note: Not supported on the PCMCIA‑4050 or the PXI/PCI‑4060.
21732173
@@ -2212,7 +2212,7 @@ def import_attribute_configuration_file(self, file_path):
22122212
**Related Topics:**
22132213
22142214
`Using Properties and Properties with
2215-
NI‑DMM <properties>`__
2215+
NI‑DMM <REPLACE_DRIVER_SPECIFIC_URL_1(properties)>`__
22162216
22172217
`Setting Properties Before Reading
22182218
Properties <javascript:LaunchHelp('DMM.chm::/setting_before_reading_attributes')>`__
@@ -2268,7 +2268,7 @@ def _init_with_options(self, resource_name, id_query=False, reset_device=False,
22682268
| Contains the **resource_name** of the device to initialize. The
22692269
**resource_name** is assigned in Measurement & Automation Explorer
22702270
(MAX). Refer to `Related
2271-
Documentation <related_documentation>`__
2271+
Documentation <REPLACE_DRIVER_SPECIFIC_URL_1(related_documentation)>`__
22722272
for the *NI Digital Multimeters Getting Started Guide* for more
22732273
information about configuring and testing the DMM in MAX.
22742274
| Valid Syntax:
@@ -2313,7 +2313,7 @@ def _init_with_options(self, resource_name, id_query=False, reset_device=False,
23132313
leave any of them out (those left out use the default value).
23142314
23152315
Refer to `Simulating NI Digital
2316-
Multimeters <simulation>`__ for more
2316+
Multimeters <REPLACE_DRIVER_SPECIFIC_URL_1(simulation)>`__ for more
23172317
information.
23182318
23192319
+------------------+--------------------+-------------------+----+

0 commit comments

Comments
 (0)