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

Cleanup After Init behavior should better match MeasurementLink workflow #417

Merged
merged 12 commits into from
Dec 4, 2023
Merged

Cleanup After Init behavior should better match MeasurementLink workflow #417

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e888a5c
change behavior of cleanup after ini
pbirkhol-ni Nov 28, 2023
3405466
more changes
pbirkhol-ni Dec 1, 2023
beddf49
Undo interface changes
pbirkhol-ni Dec 1, 2023
9fa1f28
fix visa cleanup
pbirkhol-ni Dec 1, 2023
80a9c84
Merge branch 'main' into users/pbirkhol/fix-cleanup-after-init
pbirkhol-ni Dec 1, 2023
84f8862
fix broken VI
pbirkhol-ni Dec 1, 2023
f0fbc5a
final changes for RFC
pbirkhol-ni Dec 1, 2023
882c1e9
Fix one of the two tests
pbirkhol-ni Dec 4, 2023
cf11b44
fix other test. hopefully didn't break anything else
pbirkhol-ni Dec 4, 2023
97fca34
modify existing tests to test new behavior
pbirkhol-ni Dec 4, 2023
edd6564
fix library issue
pbirkhol-ni Dec 4, 2023
e027981
Merge branch 'main' into users/pbirkhol/fix-cleanup-after-init
pbirkhol-ni Dec 4, 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
28 changes: 0 additions & 28 deletions Source/Runtime/Measurement Server.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,6 @@
<Item Name="niDMM Self-Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM Self-Test.vi"/>
<Item Name="niDigital Self Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital Self Test.vi"/>
<Item Name="niDCPower Self Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Self Test.vi"/>
<Item Name="niDCPower gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower gRPC Device Server.ctl"/>
<Item Name="niDigital Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital Get Session Reference.vi"/>
<Item Name="niDigital gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital gRPC Device Server.ctl"/>
<Item Name="niDMM gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM gRPC Device Server.ctl"/>
<Item Name="niFgen Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen Get Session Reference.vi"/>
<Item Name="niFgen gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen gRPC Device Server.ctl"/>
<Item Name="niScope Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niScope/Utility/niScope Get Session Reference.vi"/>
<Item Name="niScope gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niScope/niScope gRPC Device Server.ctl"/>
<Item Name="niDCPower IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower IVI Error Converter.vi"/>
<Item Name="niDigital IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital IVI Error Converter.vi"/>
<Item Name="niDMM IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM IVI Error Converter.vi"/>
<Item Name="niFgen IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen IVI Error Converter.vi"/>
<Item Name="niScope LabVIEW Error.vi" Type="VI" URL="/&lt;instrlib&gt;/niScope/Utility/niScope LabVIEW Error.vi"/>
</Item>
<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
Expand All @@ -135,21 +122,6 @@
<Item Name="MeasurementLink Measurement Service Base V2.lvlib" Type="Library" URL="../MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib"/>
<Item Name="MeasurementLink Pin Map Client.lvlib" Type="Library" URL="../MeasurementLink Pin Map Client/MeasurementLink Pin Map Client.lvlib"/>
<Item Name="MeasurementLink Session Management Client.lvlib" Type="Library" URL="../MeasurementLink Session Management Client/MeasurementLink Session Management Client.lvlib"/>
<Item Name="nidcpower_64.dll" Type="Document" URL="nidcpower_64.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="niDigital_64.dll" Type="Document" URL="niDigital_64.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="nidmm_64.dll" Type="Document" URL="nidmm_64.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="niFgen_64.dll" Type="Document" URL="niFgen_64.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="niScope_64.dll" Type="Document" URL="niScope_64.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="ni.protobuf.types.lvlib" Type="Library" URL="../../gRPC/Generated APIs/ni/protobuf/types/ni.protobuf.types.lvlib"/>
</Item>
<Item Name="Build Specifications" Type="Build"/>
Expand Down
Binary file modified ...k Instrument/ISession Factory/Helpers/To Cleanup Initialize and Close Session Behavior.vi
View file
Open in desktop
Binary file not shown.
Binary file added ...easurementLink Session Management/Session Reservation/Clear Error For Attach and Close.vi
View file
Open in desktop
jasonmreding marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified ...untime/MeasurementLink Session Management/Session Reservation/Initialize Sessions Impl.vi
View file
Open in desktop
Binary file not shown.
11 changes: 10 additions & 1 deletion ...untime/MeasurementLink Session Management/Session Reservation/Session Reservation.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Source/Runtime/MeasurementLink VISA/Session Factory/Clean Up After Init Error.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Runtime/MeasurementLink VISA/Session Factory/Initialize MeasurementLink Session.vi
View file
Open in desktop
Binary file not shown.
28 changes: 17 additions & 11 deletions Source/Runtime/MeasurementLink VISA/Session Factory/Session Factory.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Loading