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

Jump to bottom

examples: Add gRPC support to VISA example (34401A) #416

Merged
merged 8 commits into from
Nov 30, 2023
Merged

examples: Add gRPC support to VISA example (34401A) #416

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bfedb4e
examples: Fix missing items in 34401A lvlib
bkeryan Nov 18, 2023
b49dd08
examples: Fix missing items in NI-SCOPE lvlib
bkeryan Nov 18, 2023
7e7b070
examples: Add gRPC support to 34401A example
bkeryan Nov 18, 2023
e1c8665
examples: Replace 34401A session factory type specialization structur…
bkeryan Nov 18, 2023
c14db01
examples: Fix error chaining in VISA gRPC Open Close Behavior VI
bkeryan Nov 18, 2023
f95da20
examples: Delete 34401A BuiltUI/ dir
bkeryan Nov 18, 2023
a9e2a1a
gitignore: Ignore BuiltUI/
bkeryan Nov 18, 2023
7efa56c
feedback
pbirkhol-ni Nov 30, 2023
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
Binary file modified ...asurement/Keysight 34401A DMM Instrument/Session Factory/Close MeasurementLink Session.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added ...eysight 34401A DMM Instrument/Session Factory/Get Provided Interface and Service Class.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified ...ment/Keysight 34401A DMM Instrument/Session Factory/Initialize MeasurementLink Session.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
11 changes: 10 additions & 1 deletion ...1A DMM Measurement/Keysight 34401A DMM Instrument/Session Factory/Session Factory.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions ...ample Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/Helpers/typeDefs/ConfigurationParameter_AnnotationsEntry.ctl"/>
<Item Name="Equal Comparable.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Comparable/Equal Comparable.lvclass"/>
<Item Name="Equal Functor.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Functor/Equal Functor.lvclass"/>
<Item Name="Equals.vim" Type="VI" URL="/&lt;vilib&gt;/Comparison/Equals.vim"/>
Expand All @@ -50,7 +49,6 @@
<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
<Item Name="Output.ctl" Type="VI" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/Helpers/typeDefs/Output.ctl"/>
<Item Name="Remove Duplicates From 1D Array.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Remove Duplicates From 1D Array.vim"/>
<Item Name="Search Unsorted 1D Array Core.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Helpers/Search Unsorted 1D Array Core.vim"/>
<Item Name="Search Unsorted 1D Array.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Search Unsorted 1D Array.vim"/>
Expand All @@ -59,6 +57,12 @@
<Item Name="System Directory Type.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/sysdir.llb/System Directory Type.ctl"/>
<Item Name="System Exec.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/System Exec.vi"/>
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="VISA Format gRPC Resource Name.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC Resource Name.vi"/>
<Item Name="VISA Format gRPC URI.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC URI.vi"/>
<Item Name="VISA gRPC Open Close Behavior.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Open Close Behavior.ctl"/>
<Item Name="VISA gRPC Options.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Options.ctl"/>
<Item Name="VISA Open Access Mode.ctl" Type="VI" URL="/&lt;vilib&gt;/Instr/_visa.llb/VISA Open Access Mode.ctl"/>
<Item Name="VISA Open for gRPC Session.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Open for gRPC Session.vi"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
</Item>
<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
Expand Down
Binary file added ...urement/Keysight 34401A DMM Measurement/BuiltUI/Keysight 34401A DMM Measurement UI.lvlibp
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions ...01A DMM Measurement/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
<Item Name="MeasurementPlugin.lvclass" Type="LVClass" URL="../Advanced/MeasurementPlugin.lvclass"/>
</Item>
<Item Name="subVIs" Type="Folder">
<Item Name="Get VISA gRPC Open Close Behavior.vi" Type="VI" URL="../subVIs/Get VISA gRPC Open Close Behavior.vi"/>
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
<Item Name="Keysight 34401A Cancellation Logic.vi" Type="VI" URL="../subVIs/Keysight 34401A Cancellation Logic.vi"/>
<Item Name="Keysight 34401A Check For Out of Range.vi" Type="VI" URL="../subVIs/Keysight 34401A Check For Out of Range.vi"/>
<Item Name="Keysight 34401A Function.ctl" Type="VI" URL="../subVIs/Keysight 34401A Function.ctl"/>
<Item Name="Keysight 34401A Measurement Logic.vi" Type="VI" URL="../subVIs/Keysight 34401A Measurement Logic.vi"/>
<Item Name="Wait Until Canceled.vi" Type="VI" URL="../subVIs/Wait Until Canceled.vi"/>
</Item>
<Item Name="TestStand Code Modules" Type="Folder">
<Item Name="Create and Register Sessions.vi" Type="VI" URL="../TestStand Code Modules/Create and Register Sessions.vi"/>
<Item Name="Unregister and Destroy Sessions.vi" Type="VI" URL="../TestStand Code Modules/Unregister and Destroy Sessions.vi"/>
<Item Name="Initialize and Register Sessions.vi" Type="VI" URL="../TestStand Code Modules/Initialize and Register Sessions.vi"/>
<Item Name="Unregister and Close Sessions.vi" Type="VI" URL="../TestStand Code Modules/Unregister and Close Sessions.vi"/>
<Item Name="Update Pin Map.vi" Type="VI" URL="../TestStand Code Modules/Update Pin Map.vi"/>
</Item>
<Item Name="Get Measurement Details.vi" Type="VI" URL="../Get Measurement Details.vi"/>
Expand Down
Binary file added ...M Measurement/Keysight 34401A DMM Measurement/subVIs/Get VISA gRPC Open Close Behavior.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
4 changes: 2 additions & 2 deletions ...urements/NI-SCOPE Acquire Waveform/NI-SCOPE Acquire Waveform/NIScopeAcquireWaveform.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<Item Name="MeasurementPlugin.lvclass" Type="LVClass" URL="../Advanced/MeasurementPlugin.lvclass"/>
</Item>
<Item Name="TestStand Code Modules" Type="Folder">
<Item Name="Create and Register Sessions.vi" Type="VI" URL="../TestStand Code Modules/Create and Register Sessions.vi"/>
<Item Name="Unregister and Destroy Sessions.vi" Type="VI" URL="../TestStand Code Modules/Unregister and Destroy Sessions.vi"/>
<Item Name="Initialize and Register Sessions.vi" Type="VI" URL="../TestStand Code Modules/Initialize and Register Sessions.vi"/>
<Item Name="Unregister and Close Sessions.vi" Type="VI" URL="../TestStand Code Modules/Unregister and Close Sessions.vi"/>
<Item Name="Update Pin Map.vi" Type="VI" URL="../TestStand Code Modules/Update Pin Map.vi"/>
</Item>
<Item Name="Get Measurement Details.vi" Type="VI" URL="../Get Measurement Details.vi"/>
Expand Down
2 changes: 0 additions & 2 deletions Source/Example Measurements/NI-SCOPE Acquire Waveform/NIScopeAcquireWaveform.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/Helpers/typeDefs/ConfigurationParameter_AnnotationsEntry.ctl"/>
<Item Name="Equal Comparable.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Comparable/Equal Comparable.lvclass"/>
<Item Name="Equal Functor.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Functor/Equal Functor.lvclass"/>
<Item Name="Equals.vim" Type="VI" URL="/&lt;vilib&gt;/Comparison/Equals.vim"/>
Expand All @@ -100,7 +99,6 @@
<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
<Item Name="Output.ctl" Type="VI" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/Helpers/typeDefs/Output.ctl"/>
<Item Name="Remove Duplicates From 1D Array.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Remove Duplicates From 1D Array.vim"/>
<Item Name="Search Unsorted 1D Array Core.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Helpers/Search Unsorted 1D Array Core.vim"/>
<Item Name="Search Unsorted 1D Array.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Search Unsorted 1D Array.vim"/>
Expand Down