Skip to content

Commit ee2d06a

Browse files
ni-jfitzgerni-jfitzger
authored
Update metadata before 1.4.9 release (#2082)
* Update nidcpower metadata * Update nidcpower .proto file * Update NI-DMM metadata and proto * Update nifake, nimodinst metadata and .protos * Update niscope proto and metadata * Update nitclk metadata * Update nidigital metadata and proto * Revert "Update nidigital metadata and proto" This reverts commit b019eb9.
1 parent 4d22c69 commit ee2d06a

31 files changed

+78
-77
lines changed

‎docs/nidmm/class.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ fetch
887887
.. py:method:: fetch(maximum_time=hightime.timedelta(milliseconds=-1))
888888
889889
Returns the value from a previously initiated measurement. You must call
890-
:py:meth:`nidmm.Session._initiate` before calling this method.
890+
:py:meth:`nidmm.Session._initiate` before calling this method. Value is in base units.
891891
892892
893893
@@ -935,7 +935,7 @@ fetch_multi_point
935935
measurement. The number of measurements the DMM makes is determined by
936936
the values you specify for the **Trigger_Count** and **Sample_Count**
937937
parameters of :py:meth:`nidmm.Session.configure_multi_point`. You must first call
938-
:py:meth:`nidmm.Session._initiate` to initiate a measurement before calling this method.
938+
:py:meth:`nidmm.Session._initiate` to initiate a measurement before calling this method. Values are in base units.
939939
940940
941941
@@ -1548,7 +1548,7 @@ read
15481548
15491549
.. py:method:: read(maximum_time=hightime.timedelta(milliseconds=-1))
15501550
1551-
Acquires a single measurement and returns the measured value.
1551+
Acquires a single measurement and returns the measured value in base units.
15521552
15531553
15541554

‎generated/nidcpower/nidcpower/nidcpower_pb2.py

+34-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generated/nidmm/nidmm/session.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,7 @@ def fetch(self, maximum_time=hightime.timedelta(milliseconds=-1)):
16321632
r'''fetch
16331633
16341634
Returns the value from a previously initiated measurement. You must call
1635-
_initiate before calling this method.
1635+
_initiate before calling this method. Value is in base units.
16361636
16371637
Args:
16381638
maximum_time (hightime.timedelta, datetime.timedelta, or int in milliseconds): Specifies the **maximum_time** allowed for this method to complete in
@@ -1666,7 +1666,7 @@ def fetch_multi_point(self, array_size, maximum_time=hightime.timedelta(millisec
16661666
measurement. The number of measurements the DMM makes is determined by
16671667
the values you specify for the **Trigger_Count** and **Sample_Count**
16681668
parameters of configure_multi_point. You must first call
1669-
_initiate to initiate a measurement before calling this method.
1669+
_initiate to initiate a measurement before calling this method. Values are in base units.
16701670
16711671
Args:
16721672
array_size (int): Specifies the number of measurements to acquire. The maximum number of
@@ -2208,7 +2208,7 @@ def perform_short_cable_comp(self):
22082208
def read(self, maximum_time=hightime.timedelta(milliseconds=-1)):
22092209
r'''read
22102210
2211-
Acquires a single measurement and returns the measured value.
2211+
Acquires a single measurement and returns the measured value in base units.
22122212
22132213
Args:
22142214
maximum_time (hightime.timedelta, datetime.timedelta, or int in milliseconds): Specifies the **maximum_time** allowed for this method to complete in

‎src/nidcpower/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
2+
# This file is generated from NI-DCPower API metadata version 25.0.0f266
33
attributes = {
44
1050003: {
55
'access': 'read-write',

‎src/nidcpower/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
2+
# This file is generated from NI-DCPower API metadata version 25.0.0f266
33
config = {
4-
'api_version': '25.0.0d98',
4+
'api_version': '25.0.0f266',
55
'c_function_prefix': 'niDCPower_',
66
'close_function': 'close',
77
'context_manager_name': {

‎src/nidcpower/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
2+
# This file is generated from NI-DCPower API metadata version 25.0.0f266
33
enums = {
44
'ApertureTimeAutoMode': {
55
'values': [

‎src/nidcpower/metadata/functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
2+
# This file is generated from NI-DCPower API metadata version 25.0.0f266
33
functions = {
44
'AbortWithChannels': {
55
'documentation': {

‎src/nidcpower/metadata/nidcpower.proto

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
//---------------------------------------------------------------------
3-
// This file is generated from NI-DCPower API metadata version 24.3.0f264
3+
// This file is generated from NI-DCPower API metadata version 25.0.0f266
44
//---------------------------------------------------------------------
55
// Proto file for the NI-DCPower Metadata
66
//---------------------------------------------------------------------
@@ -408,6 +408,7 @@ enum OutputStates {
408408
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_OVER_VOLTAGE = 2;
409409
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_OVER_CURRENT = 3;
410410
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_UNREGULATED = 4;
411+
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_INHIBITED = 1163;
411412
}
412413

413414
enum MeasurementTypes {

‎src/nidmm/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DMM API metadata version 24.3.0d105
2+
# This file is generated from NI-DMM API metadata version 24.8.0f126
33
attributes = {
44
1050005: {
55
'access': 'read-write',

‎src/nidmm/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DMM API metadata version 24.3.0d105
2+
# This file is generated from NI-DMM API metadata version 24.8.0f126
33
config = {
4-
'api_version': '24.3.0d105',
4+
'api_version': '24.8.0f126',
55
'c_function_prefix': 'niDMM_',
66
'close_function': 'close',
77
'context_manager_name': {

‎src/nidmm/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DMM API metadata version 24.3.0d105
2+
# This file is generated from NI-DMM API metadata version 24.8.0f126
33
enums = {
44
'ADCCalibration': {
55
'values': [

‎src/nidmm/metadata/functions.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-DMM API metadata version 24.3.0d105
2+
# This file is generated from NI-DMM API metadata version 24.8.0f126
33
functions = {
44
'Abort': {
55
'documentation': {
@@ -644,7 +644,7 @@
644644
},
645645
'Fetch': {
646646
'documentation': {
647-
'description': '\nReturns the value from a previously initiated measurement. You must call\nniDMM_Initiate before calling this function.\n'
647+
'description': '\nReturns the value from a previously initiated measurement. You must call\nniDMM_Initiate before calling this function. Value is in base units.\n'
648648
},
649649
'included_in_proto': True,
650650
'parameters': [
@@ -681,7 +681,7 @@
681681
},
682682
'FetchMultiPoint': {
683683
'documentation': {
684-
'description': '\nReturns an array of values from a previously initiated multipoint\nmeasurement. The number of measurements the DMM makes is determined by\nthe values you specify for the **Trigger_Count** and **Sample_Count**\nparameters of niDMM_ConfigureMultiPoint. You must first call\nniDMM_Initiate to initiate a measurement before calling this function.\n'
684+
'description': '\nReturns an array of values from a previously initiated multipoint\nmeasurement. The number of measurements the DMM makes is determined by\nthe values you specify for the **Trigger_Count** and **Sample_Count**\nparameters of niDMM_ConfigureMultiPoint. You must first call\nniDMM_Initiate to initiate a measurement before calling this function. Values are in base units.\n'
685685
},
686686
'included_in_proto': True,
687687
'parameters': [
@@ -1654,7 +1654,7 @@
16541654
},
16551655
'Read': {
16561656
'documentation': {
1657-
'description': 'Acquires a single measurement and returns the measured value.'
1657+
'description': 'Acquires a single measurement and returns the measured value in base units.'
16581658
},
16591659
'included_in_proto': True,
16601660
'parameters': [

‎src/nidmm/metadata/nidmm.proto

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

22
//---------------------------------------------------------------------
3-
// This file is generated from NI-DMM API metadata version 24.3.0d105
3+
// This file is generated from NI-DMM API metadata version 24.8.0f126
44
//---------------------------------------------------------------------
55
// Proto file for the NI-DMM Metadata
66
//---------------------------------------------------------------------

‎src/nifake/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
2+
# This file is generated from NI-FAKE API metadata version 24.8.0f100
33
attributes = {
44
1000000: {
55
'access': 'read-write',

‎src/nifake/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
2+
# This file is generated from NI-FAKE API metadata version 24.8.0f100
33
config = {
4-
'api_version': '24.3.0f98',
4+
'api_version': '24.8.0f100',
55
'c_function_prefix': 'niFake_',
66
'close_function': 'close',
77
'context_manager_name': {

‎src/nifake/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
2+
# This file is generated from NI-FAKE API metadata version 24.8.0f100
33
enums = {
44
'AltColor': {
55
'values': [

‎src/nifake/metadata/functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
2+
# This file is generated from NI-FAKE API metadata version 24.8.0f100
33
functions = {
44
'Abort': {
55
'codegen_method': 'public',

‎src/nifake/metadata/nifake.proto

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

22
//---------------------------------------------------------------------
3-
// This file is generated from NI-FAKE API metadata version 24.3.0f98
3+
// This file is generated from NI-FAKE API metadata version 24.8.0f100
44
//---------------------------------------------------------------------
55
// Proto file for the NI-FAKE Metadata
66
//---------------------------------------------------------------------

‎src/nimodinst/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
2+
# This file is generated from NI-ModInst API metadata version 25.0.0f85
33
attributes = {
44
0: {
55
'access': 'read only',

‎src/nimodinst/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
2+
# This file is generated from NI-ModInst API metadata version 25.0.0f85
33
config = {
4-
'api_version': '24.3.0f101',
4+
'api_version': '25.0.0f85',
55
'c_function_prefix': 'niModInst_',
66
'close_function': 'CloseInstalledDevicesSession',
77
'context_manager_name': {

‎src/nimodinst/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
2+
# This file is generated from NI-ModInst API metadata version 25.0.0f85
33
enums = {
44
}

‎src/nimodinst/metadata/functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
2+
# This file is generated from NI-ModInst API metadata version 25.0.0f85
33
functions = {
44
'CloseInstalledDevicesSession': {
55
'codegen_method': 'private',

‎src/niscope/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
2+
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
33
attributes = {
44
1050005: {
55
'access': 'read-write',

‎src/niscope/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
2+
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
33
config = {
4-
'api_version': '24.3.0d61',
4+
'api_version': '25.0.0f151',
55
'c_function_prefix': 'niScope_',
66
'close_function': 'close',
77
'context_manager_name': {

‎src/niscope/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
2+
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
33
enums = {
44
'5900AccessoryInAScopeSessionValues': {
55
'values': [

‎src/niscope/metadata/functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
2+
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
33
functions = {
44
'Abort': {
55
'documentation': {

‎src/niscope/metadata/niscope.proto

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

22
//---------------------------------------------------------------------
3-
// This file is generated from NI-SCOPE API metadata version 24.3.0d61
3+
// This file is generated from NI-SCOPE API metadata version 25.0.0f151
44
//---------------------------------------------------------------------
55
// Proto file for the NI-SCOPE Metadata
66
//---------------------------------------------------------------------

‎src/nitclk/metadata/attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-TClk API metadata version 24.3.0f106
2+
# This file is generated from NI-TClk API metadata version 25.0.0f93
33
attributes = {
44
1: {
55
'access': 'read-write',

‎src/nitclk/metadata/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-TClk API metadata version 24.3.0f106
2+
# This file is generated from NI-TClk API metadata version 25.0.0f93
33
config = {
4-
'api_version': '24.3.0f106',
4+
'api_version': '25.0.0f93',
55
'c_function_prefix': 'niTClk_',
66
'close_function': None,
77
'context_manager_name': {

‎src/nitclk/metadata/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-TClk API metadata version 24.3.0f106
2+
# This file is generated from NI-TClk API metadata version 25.0.0f93
33
enums = {
44
}

‎src/nitclk/metadata/functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# This file is generated from NI-TClk API metadata version 24.3.0f106
2+
# This file is generated from NI-TClk API metadata version 25.0.0f93
33
functions = {
44
'ConfigureForHomogeneousTriggers': {
55
'documentation': {

0 commit comments

Comments
 (0)