Skip to content

Commit 596caf7

Browse files
Merge branch 'users/vagupta/rfsg-documentation-update' of https://github.com/Vaishnavigupta1312/nimi-python into users/vagupta/rfsg-documentation-update
2 parents 5c3c3d9 + 473d86f commit 596caf7

18 files changed

+857
-50
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
- `output_shorted`
6767
- Enum values:
6868
- `CONSTANT_RESISTANCE` and `CONSTANT_POWER` added to enum `OutputFunction`
69+
- `nidcpower_constant_resistance_and_constant_power.py` and `nidcpower_sink_dc_current_into_electronic_load.py` examples
6970
- Changed
7071
- Removed
7172

docs/nidcpower/examples.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ nidcpower_advanced_sequence.py
1212
:encoding: utf8
1313
:caption: `(nidcpower_advanced_sequence.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_advanced_sequence.py>`_
1414

15+
nidcpower_constant_resistance_and_constant_power.py
16+
---------------------------------------------------
17+
18+
.. literalinclude:: ../../src/nidcpower/examples/nidcpower_constant_resistance_and_constant_power.py
19+
:language: python
20+
:linenos:
21+
:encoding: utf8
22+
:caption: `(nidcpower_constant_resistance_and_constant_power.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_constant_resistance_and_constant_power.py>`_
23+
1524
nidcpower_lcr_source_ac_voltage.py
1625
----------------------------------
1726

@@ -30,6 +39,15 @@ nidcpower_measure_record.py
3039
:encoding: utf8
3140
:caption: `(nidcpower_measure_record.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_measure_record.py>`_
3241

42+
nidcpower_sink_dc_current_into_electronic_load.py
43+
-------------------------------------------------
44+
45+
.. literalinclude:: ../../src/nidcpower/examples/nidcpower_sink_dc_current_into_electronic_load.py
46+
:language: python
47+
:linenos:
48+
:encoding: utf8
49+
:caption: `(nidcpower_sink_dc_current_into_electronic_load.py) <https://github.com/ni/nimi-python/blob/master/src/nidcpower/examples/nidcpower_sink_dc_current_into_electronic_load.py>`_
50+
3351
nidcpower_source_delay_measure.py
3452
---------------------------------
3553

docs/nirfsg/class.rst

Lines changed: 285 additions & 3 deletions
Large diffs are not rendered by default.

docs/nirfsg/enums.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ LoopBandwidth
947947
948948
949949
950-
Uses the widest loop bandwidth setting for the PLL. Setting this property to :py:data:`~nirfsg.NIRFSG_VAL_WIDE` on the PXIe-5653 allows the reference PLL to lock to a better reference with better phase noise than the PXIe-5653 and utilize the better phase noise of the reference.
950+
Uses the widest loop bandwidth setting for the PLL.
951951

952952

953953

generated/nirfsg/nirfsg/_library.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def __init__(self, ctypes_library):
8888
self.niRFSG_ResetAttribute_cfunc = None
8989
self.niRFSG_ResetDevice_cfunc = None
9090
self.niRFSG_ResetWithDefaults_cfunc = None
91+
self.niRFSG_ResetWithOptions_cfunc = None
9192
self.niRFSG_SaveConfigurationsToFile_cfunc = None
9293
self.niRFSG_SelectArbWaveform_cfunc = None
9394
self.niRFSG_SelfCal_cfunc = None
@@ -666,6 +667,14 @@ def niRFSG_ResetWithDefaults(self, vi): # noqa: N802
666667
self.niRFSG_ResetWithDefaults_cfunc.restype = ViStatus # noqa: F405
667668
return self.niRFSG_ResetWithDefaults_cfunc(vi)
668669

670+
def niRFSG_ResetWithOptions(self, vi, steps_to_omit): # noqa: N802
671+
with self._func_lock:
672+
if self.niRFSG_ResetWithOptions_cfunc is None:
673+
self.niRFSG_ResetWithOptions_cfunc = self._get_library_function('niRFSG_ResetWithOptions')
674+
self.niRFSG_ResetWithOptions_cfunc.argtypes = [ViSession, ViUInt64] # noqa: F405
675+
self.niRFSG_ResetWithOptions_cfunc.restype = ViStatus # noqa: F405
676+
return self.niRFSG_ResetWithOptions_cfunc(vi, steps_to_omit)
677+
669678
def niRFSG_SaveConfigurationsToFile(self, vi, channel_name, file_path): # noqa: N802
670679
with self._func_lock:
671680
if self.niRFSG_SaveConfigurationsToFile_cfunc is None:

generated/nirfsg/nirfsg/_library_interpreter.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,13 @@ def reset_with_defaults(self): # noqa: N802
652652
errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
653653
return
654654

655+
def reset_with_options(self, steps_to_omit): # noqa: N802
656+
vi_ctype = _visatype.ViSession(self._vi) # case S110
657+
steps_to_omit_ctype = _visatype.ViUInt64(steps_to_omit.value) # case S130
658+
error_code = self._library.niRFSG_ResetWithOptions(vi_ctype, steps_to_omit_ctype)
659+
errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
660+
return
661+
655662
def save_configurations_to_file(self, channel_name, file_path): # noqa: N802
656663
vi_ctype = _visatype.ViSession(self._vi) # case S110
657664
channel_name_ctype = ctypes.create_string_buffer(channel_name.encode(self._encoding)) # case C010

generated/nirfsg/nirfsg/enums.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ class LoopBandwidth(Enum):
405405
'''
406406
WIDE = 2
407407
r'''
408-
Uses the widest loop bandwidth setting for the PLL. Setting this property to NIRFSG_VAL_WIDE on the PXIe-5653 allows the reference PLL to lock to a better reference with better phase noise than the PXIe-5653 and utilize the better phase noise of the reference.
408+
Uses the widest loop bandwidth setting for the PLL.
409409
'''
410410

411411

0 commit comments

Comments
 (0)