Skip to content

Update metadata before 1.4.9 release #2082

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
marcoskirsch merged 8 commits into from
Feb 26, 2025
Merged

Update metadata before 1.4.9 release #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b200f0c
Update nidcpower metadata
ni-jfitzger Feb 23, 2025
9838e07
Update nidcpower .proto file
ni-jfitzger Feb 23, 2025
fa3b3c8
Update NI-DMM metadata and proto
ni-jfitzger Feb 23, 2025
87b7dd9
Update nifake, nimodinst metadata and .protos
ni-jfitzger Feb 23, 2025
c164c6b
Update niscope proto and metadata
ni-jfitzger Feb 23, 2025
7a9b1fd
Update nitclk metadata
ni-jfitzger Feb 23, 2025
b019eb9
Update nidigital metadata and proto
ni-jfitzger Feb 24, 2025
b038f91
Revert "Update nidigital metadata and proto"
ni-jfitzger Feb 25, 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
6 changes: 3 additions & 3 deletions docs/nidmm/class.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ fetch
.. py:method:: fetch(maximum_time=hightime.timedelta(milliseconds=-1))

Returns the value from a previously initiated measurement. You must call
:py:meth:`nidmm.Session._initiate` before calling this method.
:py:meth:`nidmm.Session._initiate` before calling this method. Value is in base units.



Expand Down Expand Up @@ -935,7 +935,7 @@ fetch_multi_point
measurement. The number of measurements the DMM makes is determined by
the values you specify for the **Trigger_Count** and **Sample_Count**
parameters of :py:meth:`nidmm.Session.configure_multi_point`. You must first call
:py:meth:`nidmm.Session._initiate` to initiate a measurement before calling this method.
:py:meth:`nidmm.Session._initiate` to initiate a measurement before calling this method. Values are in base units.



Expand Down Expand Up @@ -1548,7 +1548,7 @@ read

.. py:method:: read(maximum_time=hightime.timedelta(milliseconds=-1))

Acquires a single measurement and returns the measured value.
Acquires a single measurement and returns the measured value in base units.



Expand Down
68 changes: 34 additions & 34 deletions generated/nidcpower/nidcpower/nidcpower_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions generated/nidmm/nidmm/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@ def fetch(self, maximum_time=hightime.timedelta(milliseconds=-1)):
r'''fetch

Returns the value from a previously initiated measurement. You must call
_initiate before calling this method.
_initiate before calling this method. Value is in base units.

Args:
maximum_time (hightime.timedelta, datetime.timedelta, or int in milliseconds): Specifies the **maximum_time** allowed for this method to complete in
Expand Down Expand Up @@ -1666,7 +1666,7 @@ def fetch_multi_point(self, array_size, maximum_time=hightime.timedelta(millisec
measurement. The number of measurements the DMM makes is determined by
the values you specify for the **Trigger_Count** and **Sample_Count**
parameters of configure_multi_point. You must first call
_initiate to initiate a measurement before calling this method.
_initiate to initiate a measurement before calling this method. Values are in base units.

Args:
array_size (int): Specifies the number of measurements to acquire. The maximum number of
Expand Down Expand Up @@ -2208,7 +2208,7 @@ def perform_short_cable_comp(self):
def read(self, maximum_time=hightime.timedelta(milliseconds=-1)):
r'''read

Acquires a single measurement and returns the measured value.
Acquires a single measurement and returns the measured value in base units.

Args:
maximum_time (hightime.timedelta, datetime.timedelta, or int in milliseconds): Specifies the **maximum_time** allowed for this method to complete in
Expand Down
2 changes: 1 addition & 1 deletion src/nidcpower/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
# This file is generated from NI-DCPower API metadata version 25.0.0f266
attributes = {
1050003: {
'access': 'read-write',
Expand Down
4 changes: 2 additions & 2 deletions src/nidcpower/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
# This file is generated from NI-DCPower API metadata version 25.0.0f266
config = {
'api_version': '25.0.0d98',
'api_version': '25.0.0f266',
'c_function_prefix': 'niDCPower_',
'close_function': 'close',
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/nidcpower/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
# This file is generated from NI-DCPower API metadata version 25.0.0f266
enums = {
'ApertureTimeAutoMode': {
'values': [
Expand Down
2 changes: 1 addition & 1 deletion src/nidcpower/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DCPower API metadata version 25.0.0d98
# This file is generated from NI-DCPower API metadata version 25.0.0f266
functions = {
'AbortWithChannels': {
'documentation': {
Expand Down
3 changes: 2 additions & 1 deletion src/nidcpower/metadata/nidcpower.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-DCPower API metadata version 24.3.0f264
// This file is generated from NI-DCPower API metadata version 25.0.0f266
//---------------------------------------------------------------------
// Proto file for the NI-DCPower Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -408,6 +408,7 @@ enum OutputStates {
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_OVER_VOLTAGE = 2;
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_OVER_CURRENT = 3;
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_UNREGULATED = 4;
OUTPUT_STATES_NIDCPOWER_VAL_OUTPUT_INHIBITED = 1163;
}

enum MeasurementTypes {
Expand Down
2 changes: 1 addition & 1 deletion src/nidmm/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DMM API metadata version 24.3.0d105
# This file is generated from NI-DMM API metadata version 24.8.0f126
attributes = {
1050005: {
'access': 'read-write',
Expand Down
4 changes: 2 additions & 2 deletions src/nidmm/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DMM API metadata version 24.3.0d105
# This file is generated from NI-DMM API metadata version 24.8.0f126
config = {
'api_version': '24.3.0d105',
'api_version': '24.8.0f126',
'c_function_prefix': 'niDMM_',
'close_function': 'close',
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/nidmm/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DMM API metadata version 24.3.0d105
# This file is generated from NI-DMM API metadata version 24.8.0f126
enums = {
'ADCCalibration': {
'values': [
Expand Down
8 changes: 4 additions & 4 deletions src/nidmm/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-DMM API metadata version 24.3.0d105
# This file is generated from NI-DMM API metadata version 24.8.0f126
functions = {
'Abort': {
'documentation': {
Expand Down Expand Up @@ -644,7 +644,7 @@
},
'Fetch': {
'documentation': {
'description': '\nReturns the value from a previously initiated measurement. You must call\nniDMM_Initiate before calling this function.\n'
'description': '\nReturns the value from a previously initiated measurement. You must call\nniDMM_Initiate before calling this function. Value is in base units.\n'
},
'included_in_proto': True,
'parameters': [
Expand Down Expand Up @@ -681,7 +681,7 @@
},
'FetchMultiPoint': {
'documentation': {
'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'
'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'
},
'included_in_proto': True,
'parameters': [
Expand Down Expand Up @@ -1654,7 +1654,7 @@
},
'Read': {
'documentation': {
'description': 'Acquires a single measurement and returns the measured value.'
'description': 'Acquires a single measurement and returns the measured value in base units.'
},
'included_in_proto': True,
'parameters': [
Expand Down
2 changes: 1 addition & 1 deletion src/nidmm/metadata/nidmm.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-DMM API metadata version 24.3.0d105
// This file is generated from NI-DMM API metadata version 24.8.0f126
//---------------------------------------------------------------------
// Proto file for the NI-DMM Metadata
//---------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/nifake/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
# This file is generated from NI-FAKE API metadata version 24.8.0f100
attributes = {
1000000: {
'access': 'read-write',
Expand Down
4 changes: 2 additions & 2 deletions src/nifake/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
# This file is generated from NI-FAKE API metadata version 24.8.0f100
config = {
'api_version': '24.3.0f98',
'api_version': '24.8.0f100',
'c_function_prefix': 'niFake_',
'close_function': 'close',
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/nifake/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
# This file is generated from NI-FAKE API metadata version 24.8.0f100
enums = {
'AltColor': {
'values': [
Expand Down
2 changes: 1 addition & 1 deletion src/nifake/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-FAKE API metadata version 24.3.0f98
# This file is generated from NI-FAKE API metadata version 24.8.0f100
functions = {
'Abort': {
'codegen_method': 'public',
Expand Down
2 changes: 1 addition & 1 deletion src/nifake/metadata/nifake.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-FAKE API metadata version 24.3.0f98
// This file is generated from NI-FAKE API metadata version 24.8.0f100
//---------------------------------------------------------------------
// Proto file for the NI-FAKE Metadata
//---------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/nimodinst/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
# This file is generated from NI-ModInst API metadata version 25.0.0f85
attributes = {
0: {
'access': 'read only',
Expand Down
4 changes: 2 additions & 2 deletions src/nimodinst/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
# This file is generated from NI-ModInst API metadata version 25.0.0f85
config = {
'api_version': '24.3.0f101',
'api_version': '25.0.0f85',
'c_function_prefix': 'niModInst_',
'close_function': 'CloseInstalledDevicesSession',
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/nimodinst/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
# This file is generated from NI-ModInst API metadata version 25.0.0f85
enums = {
}
2 changes: 1 addition & 1 deletion src/nimodinst/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-ModInst API metadata version 24.3.0f101
# This file is generated from NI-ModInst API metadata version 25.0.0f85
functions = {
'CloseInstalledDevicesSession': {
'codegen_method': 'private',
Expand Down
2 changes: 1 addition & 1 deletion src/niscope/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
attributes = {
1050005: {
'access': 'read-write',
Expand Down
4 changes: 2 additions & 2 deletions src/niscope/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
config = {
'api_version': '24.3.0d61',
'api_version': '25.0.0f151',
'c_function_prefix': 'niScope_',
'close_function': 'close',
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/niscope/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
enums = {
'5900AccessoryInAScopeSessionValues': {
'values': [
Expand Down
2 changes: 1 addition & 1 deletion src/niscope/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-SCOPE API metadata version 24.3.0d61
# This file is generated from NI-SCOPE API metadata version 25.0.0f151
functions = {
'Abort': {
'documentation': {
Expand Down
2 changes: 1 addition & 1 deletion src/niscope/metadata/niscope.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-SCOPE API metadata version 24.3.0d61
// This file is generated from NI-SCOPE API metadata version 25.0.0f151
//---------------------------------------------------------------------
// Proto file for the NI-SCOPE Metadata
//---------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/nitclk/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-TClk API metadata version 24.3.0f106
# This file is generated from NI-TClk API metadata version 25.0.0f93
attributes = {
1: {
'access': 'read-write',
Expand Down
4 changes: 2 additions & 2 deletions src/nitclk/metadata/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-TClk API metadata version 24.3.0f106
# This file is generated from NI-TClk API metadata version 25.0.0f93
config = {
'api_version': '24.3.0f106',
'api_version': '25.0.0f93',
'c_function_prefix': 'niTClk_',
'close_function': None,
'context_manager_name': {
Expand Down
2 changes: 1 addition & 1 deletion src/nitclk/metadata/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-TClk API metadata version 24.3.0f106
# This file is generated from NI-TClk API metadata version 25.0.0f93
enums = {
}
2 changes: 1 addition & 1 deletion src/nitclk/metadata/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# This file is generated from NI-TClk API metadata version 24.3.0f106
# This file is generated from NI-TClk API metadata version 25.0.0f93
functions = {
'ConfigureForHomogeneousTriggers': {
'documentation': {
Expand Down