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

merged 8 commits into from
Nov 30, 2023

Conversation

bkeryan
Copy link
Collaborator

@bkeryan bkeryan commented Nov 18, 2023 •
edited
Loading

What does this Pull Request accomplish?

Keysight 34401A DMM Measurement:

  • Add gRPC support
  • Replace type specialization structure with call by reference node

.gitignore:

  • Ignore BuiltUI/ subdirectories

Why should this Pull Request be merged?

Allow sharing VISA sessions between multiple measurement services.

What testing has been done?

  • Manually tested in InstrumentStudio and TestStand.
  • Used NI IO Trace to verify that the correct initialization behaviors were used (IS: 1; TS: 3, 2, 4)
  • Did not test w/o Agilent 34401 driver installed.

RUN_G_DIFF_CHECK

@github-actions GitHub Actions
Copy link

4 of 4 files processed successfully.
Processed Get Provided Interface and Service Class.vi: Success
Added Get Provided Interface and Service Class.vi.  Screenshots coming soon.

Processed Get VISA gRPC Open Close Behavior.vi: Success
Added Get VISA gRPC Open Close Behavior.vi.  Screenshots coming soon.

Processed Close MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     None

Block Diagram Functional Changes
     Added
          Call By Reference Agilent 34401.lvlib:Close.vi Added at (156,186)
          String Constant driver name Added at (136,257)
          SubVI Merge Driver Call by Reference Error.vi Added at (229,225)
     Deleted
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Format Into String  Deleted at (201,221)
          Global Variable Error Strings Global Internal.vi Deleted at (140,199)
          Numeric Constant error code (0) Deleted at (160,177)
          String Constant  Deleted at (138,262)
          SubVI Agilent 34401.lvlib:Close.vi Deleted at (187,209)
          SubVI Error Cluster From Error Code.vi Deleted at (266,209)
          Type Specialization Structure  Deleted at (107,142)
     wiring changes

Processed Initialize MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".
     default data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".

Block Diagram Functional Changes
     Added
          Call By Reference  Added at (490,229)
          Call By Reference Agilent 34401.lvlib:Initialize.vi Added at (631,229)
          Or  Added at (364,297)
          String Constant driver name Added at (514,313)
          String Constant driver name Added at (647,313)
          SubVI Keysight 34401A DMM Measurement.lvlib:Get VISA gRPC Open Close Behavior.vi Added at (423,252)
          SubVI Merge Driver Call by Reference Error.vi Added at (561,268)
          SubVI Merge Driver Call by Reference Error.vi Added at (694,268)
          Tunnel  Added at (99,372)
          Tunnel  Added at (99,372)
     Deleted
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Format Into String  Deleted at (425,264)
          Global Variable Error Strings Global Internal.vi Deleted at (364,239)
          Numeric Constant error code (0) Deleted at (384,217)
          Or  Deleted at (364,294)
          String Constant  Deleted at (340,295)
          SubVI Agilent 34401.lvlib:Initialize.vi Deleted at (427,252)
          SubVI Error Cluster From Error Code.vi Deleted at (482,252)
          Type Specialization Structure  Deleted at (321,147)
     wiring changes

@github-actions GitHub Actions
Copy link

4 of 4 files processed successfully.
Processed Get Provided Interface and Service Class.vi: Success
Added Get Provided Interface and Service Class.vi.  Screenshots coming soon.

Processed Get VISA gRPC Open Close Behavior.vi: Success
Added Get VISA gRPC Open Close Behavior.vi.  Screenshots coming soon.

Processed Close MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     None

Block Diagram Functional Changes
     Added
          Call By Reference Agilent 34401.lvlib:Close.vi Added at (156,186)
          String Constant driver name Added at (136,257)
          SubVI Merge Driver Call by Reference Error.vi Added at (229,225)
     Deleted
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Format Into String  Deleted at (201,221)
          Global Variable Error Strings Global Internal.vi Deleted at (140,199)
          Numeric Constant error code (0) Deleted at (160,177)
          String Constant  Deleted at (138,262)
          SubVI Agilent 34401.lvlib:Close.vi Deleted at (187,209)
          SubVI Error Cluster From Error Code.vi Deleted at (266,209)
          Type Specialization Structure  Deleted at (107,142)
     wiring changes

Processed Initialize MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".
     default data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".

Block Diagram Functional Changes
     Added
          Call By Reference  Added at (490,229)
          Call By Reference Agilent 34401.lvlib:Initialize.vi Added at (631,229)
          Or  Added at (364,297)
          String Constant driver name Added at (514,313)
          String Constant driver name Added at (647,313)
          SubVI Keysight 34401A DMM Measurement.lvlib:Get VISA gRPC Open Close Behavior.vi Added at (423,252)
          SubVI Merge Driver Call by Reference Error.vi Added at (561,268)
          SubVI Merge Driver Call by Reference Error.vi Added at (694,268)
          Tunnel  Added at (99,372)
          Tunnel  Added at (99,372)
     Deleted
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Format Into String  Deleted at (425,264)
          Global Variable Error Strings Global Internal.vi Deleted at (364,239)
          Numeric Constant error code (0) Deleted at (384,217)
          Or  Deleted at (364,294)
          String Constant  Deleted at (340,295)
          SubVI Agilent 34401.lvlib:Initialize.vi Deleted at (427,252)
          SubVI Error Cluster From Error Code.vi Deleted at (482,252)
          Type Specialization Structure  Deleted at (321,147)
     wiring changes

bkeryan
bkeryan commented Nov 18, 2023
View reviewed changes
...urement/Keysight 34401A DMM Instrument/Session Factory/Initialize MeasurementLink Session.vi Outdated Show resolved Hide resolved
...t/Keysight 34401A DMM Instrument/Session Factory/Get Provided Interface and Service Class.vi Outdated Show resolved Hide resolved
... Measurement/Keysight 34401A DMM Instrument/Session Factory/Close MeasurementLink Session.vi Outdated Show resolved Hide resolved
... DMM Measurement/Keysight 34401A DMM Measurement/subVIs/Get VISA gRPC Open Close Behavior.vi Outdated Show resolved Hide resolved
...urement/Keysight 34401A DMM Instrument/Session Factory/Initialize MeasurementLink Session.vi Outdated Show resolved Hide resolved
... DMM Measurement/Keysight 34401A DMM Measurement/subVIs/Get VISA gRPC Open Close Behavior.vi Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

4 of 4 files processed successfully.
Processed Get Provided Interface and Service Class.vi: Success
Added Get Provided Interface and Service Class.vi.  Screenshots coming soon.

Processed Get VISA gRPC Open Close Behavior.vi: Success
Added Get VISA gRPC Open Close Behavior.vi.  Screenshots coming soon.

Processed Close MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     None

Block Diagram Functional Changes
     Added
          Call By Reference Agilent 34401.lvlib:Close.vi Added at (156,186)
          String Constant driver name Added at (136,257)
          SubVI Merge Driver Call by Reference Error.vi Added at (229,225)
     Deleted
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Format Into String  Deleted at (201,221)
          Global Variable Error Strings Global Internal.vi Deleted at (140,199)
          Numeric Constant error code (0) Deleted at (160,177)
          String Constant  Deleted at (138,262)
          SubVI Agilent 34401.lvlib:Close.vi Deleted at (187,209)
          SubVI Error Cluster From Error Code.vi Deleted at (266,209)
          Type Specialization Structure  Deleted at (107,142)
     wiring changes

Processed Initialize MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".
     default data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".

Block Diagram Functional Changes
     Added
          Call By Reference  Added at (490,229)
          Call By Reference Agilent 34401.lvlib:Initialize.vi Added at (631,229)
          Or  Added at (364,297)
          String Constant driver name Added at (514,313)
          String Constant driver name Added at (647,313)
          SubVI Keysight 34401A DMM Measurement.lvlib:Get VISA gRPC Open Close Behavior.vi Added at (423,252)
          SubVI Merge Driver Call by Reference Error.vi Added at (561,268)
          SubVI Merge Driver Call by Reference Error.vi Added at (694,268)
          Tunnel  Added at (99,372)
          Tunnel  Added at (99,372)
     Deleted
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Format Into String  Deleted at (425,264)
          Global Variable Error Strings Global Internal.vi Deleted at (364,239)
          Numeric Constant error code (0) Deleted at (384,217)
          Or  Deleted at (364,294)
          String Constant  Deleted at (340,295)
          SubVI Agilent 34401.lvlib:Initialize.vi Deleted at (427,252)
          SubVI Error Cluster From Error Code.vi Deleted at (482,252)
          Type Specialization Structure  Deleted at (321,147)
     wiring changes

Base automatically changed from users/bkeryan/fix-lvlib-missing-vis to main November 27, 2023 20:55
@github-actions GitHub Actions
Copy link

4 of 4 files processed successfully.
Processed Get Provided Interface and Service Class.vi: Success
Added Get Provided Interface and Service Class.vi.  Screenshots coming soon.

Processed Get VISA gRPC Open Close Behavior.vi: Success
Added Get VISA gRPC Open Close Behavior.vi.  Screenshots coming soon.

Processed Close MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     None

Block Diagram Functional Changes
     Added
          Call By Reference Agilent 34401.lvlib:Close.vi Added at (156,186)
          String Constant driver name Added at (136,257)
          SubVI Merge Driver Call by Reference Error.vi Added at (229,225)
     Deleted
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,209)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (107,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Code Disable Tunnel  Deleted at (319,233)
          Format Into String  Deleted at (201,221)
          Global Variable Error Strings Global Internal.vi Deleted at (140,199)
          Numeric Constant error code (0) Deleted at (160,177)
          String Constant  Deleted at (138,262)
          SubVI Agilent 34401.lvlib:Close.vi Deleted at (187,209)
          SubVI Error Cluster From Error Code.vi Deleted at (266,209)
          Type Specialization Structure  Deleted at (107,142)
     wiring changes

Processed Initialize MeasurementLink Session.vi: Success
Attribute, Panel, and Diagram changes (screenshots coming soon):
Attribute Changes
     None

Front Panel Functional Changes
     data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".
     default data value
          LabVIEW Object session factory in Changed from "(???)" to "(???)".
          LabVIEW Object session factory out Changed from "(???)" to "(???)".

Block Diagram Functional Changes
     Added
          Call By Reference Agilent 34401.lvlib:Initialize.vi Added at (694,229)
          Call By Reference Keysight 34401A DMM Instrument.lvlib:Session Factory.lvclass:Get VISA gRPC Open Close Behavior.vi Added at (423,229)
          Call By Reference VISA Open for gRPC Session.vi Added at (553,229)
          Or  Added at (378,297)
          String Constant driver name Added at (414,325)
          String Constant driver name Added at (710,313)
          SubVI Merge Driver Call by Reference Error.vi Added at (497,268)
          SubVI Merge Driver Call by Reference Error.vi Added at (624,268)
          SubVI Merge Driver Call by Reference Error.vi Added at (757,268)
          Tunnel  Added at (99,372)
          Tunnel  Added at (99,372)
     Deleted
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,197)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,214)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,252)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,276)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (321,301)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,252)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Code Disable Tunnel  Deleted at (527,276)
          Format Into String  Deleted at (425,264)
          Global Variable Error Strings Global Internal.vi Deleted at (364,239)
          Numeric Constant error code (0) Deleted at (384,217)
          Or  Deleted at (364,294)
          String Constant  Deleted at (340,295)
          SubVI Agilent 34401.lvlib:Initialize.vi Deleted at (427,252)
          SubVI Error Cluster From Error Code.vi Deleted at (482,252)
          Type Specialization Structure  Deleted at (321,147)
     wiring changes

@pbirkhol-ni pbirkhol-ni merged commit 06b8641 into main Nov 30, 2023
2 checks passed
@pbirkhol-ni pbirkhol-ni deleted the users/bkeryan/visa-grpc branch November 30, 2023 19:44
jasonmreding added a commit that referenced this pull request Dec 5, 2023
@jasonmreding
Merge branch 'main' into users/jreding/renames
fe961f2 
* main:
  Update examples to use new Run Service.vi (#429)
  Update the service class of the .measui for LabVIEW Game of Life. It was still pointing to the .NET measurement service. (#427)
  Add unit tests for data type checking (#426)
  Update Keysight doc and delete UIProgressUpdates (#425)
  Create a generic VISA example (#421)
  Remove UI Progress Updates example. Game of Life covers the same features (#424)
  Bump version for pre-release (#423)
  Fix up Get Metadata from Configuration and Results to use a common subVI. Fix the logic for getting the array element type (#422)
  examples: Add gRPC support to VISA example (34401A) (#416)
  Remove breakpoint (#420)
  Use type definition name of actual DoubleXYData .ctl (#410)
  Add a VISA plugin for generic VISA support (#413)
  examples: Fix lvlib references to old TestStand VI names (#415)
  Fix ni_protobuf_types.vipb source path and build number (#414)
  Add game of life example (#402)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbirkhol-ni pbirkhol-ni pbirkhol-ni approved these changes

@jasonmreding jasonmreding jasonmreding approved these changes

@dixonjoel dixonjoel Awaiting requested review from dixonjoel dixonjoel is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bkeryan @pbirkhol-ni @jasonmreding