Skip to content
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

Internal/nidcpower #982

Merged
merged 9 commits into from
May 24, 2019
Merged

Internal/nidcpower #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a142d2
Enable nidcpower
texasaggie97-zz May 15, 2019
77fe8b5
Add some helpful information on assert
texasaggie97-zz May 15, 2019
31a7d8d
Add config_addon
texasaggie97-zz May 15, 2019
3190f4b
Update metadata
texasaggie97-zz May 15, 2019
03a348b
nimpy/pypy workaround
texasaggie97-zz May 15, 2019
0adfa0e
Update generated files
texasaggie97-zz May 15, 2019
c72960d
Merge branch 'internal/metadata_updates' into internal/nidcpower
texasaggie97-zz May 15, 2019
7ac57ba
Merge branch 'internal/metadata_updates' into internal/nidcpower
texasaggie97-zz May 20, 2019
6fe8729
Merge branch 'internal/metadata_updates' into internal/nidcpower
texasaggie97-zz May 21, 2019
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ALL_DRIVERS := nifake nimodinst niswitch nidmm niscope
ALL_DRIVERS := nifake nidcpower nidmm niscope niswitch nimodinst
DRIVERS ?= $(ALL_DRIVERS)

ROOT_DIR := $(abspath .)
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ NI-DCPower Python API Status
+-------------------------------+--------------------------+
| NI-DCPower (nidcpower) | |
+===============================+==========================+
| Driver Version Tested Against | 18.1.1 |
| Driver Version Tested Against | 19.1.0d33 |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be re-generated to have the distinct API version?

+-------------------------------+--------------------------+
| PyPI Version | |nidcpowerLatestVersion| |
+-------------------------------+--------------------------+
Expand Down
2 changes: 1 addition & 1 deletion build/helper/metadata_add_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def _add_enum_value_python_name(enum_info, config):

# We need to check again to see if we have any values that start with a digit
for v in enum_info['values']:
assert not v['python_name'][0].isdigit()
assert not v['python_name'][0].isdigit(), 'enum {0} value {1} begins with a digit'.format(enum_info, v['python_name'])

return enum_info

Expand Down
388 changes: 250 additions & 138 deletions docs/nidcpower/class.rst
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/nidcpower/status.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NI-DCPower Python API Status
+-------------------------------+--------------------------+
| NI-DCPower (nidcpower) | |
+===============================+==========================+
| Driver Version Tested Against | 18.1.1 |
| Driver Version Tested Against | 19.1.0d33 |
+-------------------------------+--------------------------+
| PyPI Version | |nidcpowerLatestVersion| |
+-------------------------------+--------------------------+
Expand Down
56 changes: 40 additions & 16 deletions generated/nidcpower/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,12 @@ class _SessionBase(object):
'''Type: float

Specifies the current limit, in amps, that the output cannot exceed when generating the desired voltage level on the specified channel(s).
This property is applicable only if the output_function property is set to OutputFunction.DC_VOLTAGE and the compliance_limit_symmetry property is set to NIDCPOWER_VAL_SYMMETRIC.
This property is applicable only if the output_function property is set to OutputFunction.DC_VOLTAGE and the compliance_limit_symmetry property is set to ComplianceLimitSymmetry.SYMMETRIC.
output_enabled property for more information about enabling the output channel.
Valid Values: The valid values for this property are defined by the values to which current_limit_range property is set.

Note: The channel must be enabled for the specified current limit to take effect. Refer to the

Note:
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.

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
Expand Down Expand Up @@ -384,6 +381,18 @@ class _SessionBase(object):
session.channels[0,1].current_limit_autorange = var
var = session.channels[0,1].current_limit_autorange
'''
current_limit_behavior = _attributes.AttributeViInt32(1250004)
'''Type: int

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
You can specify a subset of repeated capabilities using the Python index notation on an
nidcpower.Session repeated capabilities container, and calling set/get value on the result.:

session.channels[0,1].current_limit_behavior = var
var = session.channels[0,1].current_limit_behavior
'''
current_limit_high = _attributes.AttributeViReal64(1150187)
'''Type: float

Expand Down Expand Up @@ -1270,14 +1279,11 @@ class _SessionBase(object):
'''Type: float

Specifies the pulse current limit, in amps, that the output cannot exceed when generating the desired pulse voltage on the specified channel(s) during the on phase of a pulse.
This property is applicable only if the output_function property is set to OutputFunction.PULSE_VOLTAGE and the compliance_limit_symmetry property is set to NIDCPOWER_VAL_SYMMETRIC.
This property is applicable only if the output_function property is set to OutputFunction.PULSE_VOLTAGE and the compliance_limit_symmetry property is set to ComplianceLimitSymmetry.SYMMETRIC.
Valid Values: The valid values for this property are defined by the values you specify for the pulse_current_limit_range property.

Note: This property is not supported by all devices. Refer to Supported Properties by Device for information about supported devices.

Note:
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.

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
Expand Down Expand Up @@ -1483,14 +1489,11 @@ class _SessionBase(object):
'''Type: float

Specifies the pulse voltage limit, in volts, that the output cannot exceed when generating the desired pulse current on the specified channel(s) during the on phase of a pulse.
This property is applicable only if the output_function property is set to OutputFunction.PULSE_CURRENT and the compliance_limit_symmetry property is set to NIDCPOWER_VAL_SYMMETRIC.
This property is applicable only if the output_function property is set to OutputFunction.PULSE_CURRENT and the compliance_limit_symmetry property is set to ComplianceLimitSymmetry.SYMMETRIC.
Valid Values: The valid values for this property are defined by the values you specify for the pulse_voltage_limit_range property.

Note: This property is not supported by all devices. Refer to Supported Properties by Device for information about supported devices.

Note:
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.

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
Expand Down Expand Up @@ -1805,6 +1808,30 @@ class _SessionBase(object):

Note: This property is not supported by all devices. When the
'''
sequence_step_delta_time = _attributes.AttributeViReal64(1150198)
'''Type: float

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
You can specify a subset of repeated capabilities using the Python index notation on an
nidcpower.Session repeated capabilities container, and calling set/get value on the result.:

session.channels[0,1].sequence_step_delta_time = var
var = session.channels[0,1].sequence_step_delta_time
'''
sequence_step_delta_time_enabled = _attributes.AttributeViReal64(1150199)
'''Type: float

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
You can specify a subset of repeated capabilities using the Python index notation on an
nidcpower.Session repeated capabilities container, and calling set/get value on the result.:

session.channels[0,1].sequence_step_delta_time_enabled = var
var = session.channels[0,1].sequence_step_delta_time_enabled
'''
simulate = _attributes.AttributeViBoolean(1050005)
'''Type: bool

Expand Down Expand Up @@ -2025,15 +2052,12 @@ class _SessionBase(object):
'''Type: float

Specifies the voltage limit, in volts, that the output cannot exceed when generating the desired current level on the specified channels.
This property is applicable only if the output_function property is set to OutputFunction.DC_CURRENT and the compliance_limit_symmetry property is set to NIDCPOWER_VAL_SYMMETRIC.
This property is applicable only if the output_function property is set to OutputFunction.DC_CURRENT and the compliance_limit_symmetry property is set to ComplianceLimitSymmetry.SYMMETRIC.
output_enabled property for more information about enabling the output channel.
Valid Values: The valid values for this property are defined by the values to which the voltage_limit_range property is set.

Note: The channel must be enabled for the specified current level to take effect. Refer to the

Note:
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.

Tip:
This property can use repeated capabilities (channels). If set or get directly on the
nidcpower.Session object, then the set/get will use all repeated capabilities in the session.
Expand Down
Loading