Skip to content
Snippets Groups Projects
Commit f2689fc1 authored by Post, Fabian's avatar Post, Fabian
Browse files

Merge branch 'feature/stepperSMCI33-1' into develop

parents 23546bfe 268b28b6
No related branches found
No related tags found
No related merge requests found
Showing
with 36865 additions and 2 deletions
No preview for this file type
No preview for this file type
This diff is collapsed.
No preview for this file type
No preview for this file type
File added
......@@ -82,7 +82,7 @@
<Property Name="type" Type="Str">Network</Property>
<Property Name="typedefName1" Type="Str">Pad_Print_v3_1.lvlib:graph_variables.ctl</Property>
<Property Name="typedefPath1" Type="PathRel">../graph_variables.ctl</Property>
<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!*O;A)!!#!!A!!!!!!9!!F!#A!$5&amp;^9!!F!#A!$5&amp;^:!!F!#A!$6F^9!!F!#A!$6F^:!".!#A!.15EQ8U:P=G.F)&amp;.V9A!&lt;1!I!&amp;&amp;2P=C""9S"797R@2G^S9W5A6'^S!!!41!)!$62P=H&amp;V:3""1S"797Q!$U!$!!F18VB@:(*J&gt;G5!$U!$!!F18VF@:(*J&gt;G5!$%!B"H.U982V=Q!!#U!$!!2D&lt;W2F!!!11$$`````"H.P&gt;8*D:1!!&amp;%"1!!-!#1!+!!M(28*S&lt;X)A?!!51&amp;!!!Q!*!!I!#Q&gt;&amp;=H*P=C":!!^!!Q!*6F^98W2S;8:F!!^!!Q!*6F^:8W2S;8:F!!^!#A!*6&amp;^98W2S;8:F!!^!#A!*6&amp;^:8W2S;8:F!!^!!Q!)=(*J&lt;H2@&lt;H)!!!V!#A!(&gt;'FN:6^N=Q!@1!-!'7.V=H*F&lt;H1A=X2B&gt;'5A98*S98EA;7ZE:8A!%5!+!!JM&lt;W&amp;E1W6M&lt;&amp;]R!!!21!I!#GRP972$:7RM8T)!!'M!]1!!!!!!!!!#&amp;&amp;"B:&amp;^1=GFO&gt;&amp;^W-V]R,GRW&lt;'FC%W&gt;S98"I8X:B=GFB9GRF=SZD&gt;'Q!/E"1!"1!!!!"!!)!!Q!%!!5!"A!(!!A!$!!.!!Y!$Q!1!"%!%A!4!"1!&amp;1!7"U.M&gt;8.U:8)!!1!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!-"`1)!!#!!A!!!!!!&gt;!!F!#A!$5&amp;^9!!F!#A!$5&amp;^:!!F!#A!$6F^9!!F!#A!$6F^:!".!#A!.15EQ8U:P=G.F)&amp;.V9A!&lt;1!I!&amp;&amp;2P=C""9S"797R@2G^S9W5A6'^S!!!41!)!$62P=H&amp;V:3""1S"797Q!$U!$!!F18VB@:(*J&gt;G5!$U!$!!F18VF@:(*J&gt;G5!$%!B"H.U982V=Q!!#U!$!!2D&lt;W2F!!!11$$`````"H.P&gt;8*D:1!!&amp;%"1!!-!#1!+!!M(28*S&lt;X)A?!!51&amp;!!!Q!*!!I!#Q&gt;&amp;=H*P=C":!!^!!Q!*6F^98W2S;8:F!!^!!Q!*6F^:8W2S;8:F!!^!#A!*6&amp;^98W2S;8:F!!^!#A!*6&amp;^:8W2S;8:F!!^!!Q!)=(*J&lt;H2@&lt;H)!!!V!#A!(&gt;'FN:6^N=Q!@1!-!'7.V=H*F&lt;H1A=X2B&gt;'5A98*S98EA;7ZE:8A!%5!+!!JM&lt;W&amp;E1W6M&lt;&amp;]R!!!21!I!#GRP972$:7RM8T)!!".!#A!.&gt;'6N='6S982V=G6@-1!41!I!$82F&lt;8"F=G&amp;U&gt;8*F8T)!%U!+!!VU:7VQ:8*B&gt;(6S:6]T!"6!#A!0&gt;'6N='6S982V=G6@:7ZW!".!#A!-;(6N;72J&gt;(F@:7ZW!!"V!0%!!!!!!!!!!B21972@5(*J&lt;H2@&gt;D.@-3ZM&gt;GRJ9B.H=G&amp;Q;&amp;^W98*J97*M:8-O9X2M!%2!5!!:!!!!!1!#!!-!"!!&amp;!!9!"Q!)!!Q!$1!/!!]!%!!2!")!%Q!5!"5!&amp;A!8!"A!'1!;!"M(1WRV=X2F=A!"!"Q!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="variables" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
......@@ -98,14 +98,15 @@
</Item>
</Item>
<Item Name="TypeDefs" Type="Folder">
<Property Name="NI.SortType" Type="Int">3</Property>
<Item Name="boolean_sensor_state.ctl" Type="VI" URL="../boolean_sensor_state.ctl"/>
<Item Name="case_control.ctl" Type="VI" URL="../case_control.ctl"/>
<Item Name="graph_variables.ctl" Type="VI" URL="../graph_variables.ctl"/>
<Item Name="high_level_control.ctl" Type="VI" URL="../high_level_control.ctl"/>
<Item Name="main prog cont switch.ctl" Type="VI" URL="../main prog cont switch.ctl"/>
<Item Name="main prog indicator.ctl" Type="VI" URL="../main prog indicator.ctl"/>
<Item Name="Module Configurations_self.ctl" Type="VI" URL="../Module Configurations_self.ctl"/>
<Item Name="reading sensor.ctl" Type="VI" URL="../reading sensor.ctl"/>
<Item Name="Module Configurations_self.ctl" Type="VI" URL="../Module Configurations_self.ctl"/>
<Item Name="Shunt Calibration and Offset Nulling Measurements_self.ctl" Type="VI" URL="../Shunt Calibration and Offset Nulling Measurements_self.ctl"/>
<Item Name="variables.ctl" Type="VI" URL="../variables.ctl"/>
</Item>
......@@ -135,5 +136,6 @@
<Item Name="TaF.vi" Type="VI" URL="../TaF.vi"/>
<Item Name="Take Avg Measurement (SubVI)_self.vi" Type="VI" URL="../Take Avg Measurement (SubVI)_self.vi"/>
<Item Name="Timer (SubVI)_self.vi" Type="VI" URL="../Timer (SubVI)_self.vi"/>
<Item Name="viscosity_measurement.vi" Type="VI" URL="../viscosity_measurement.vi"/>
</Item>
</Library>
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment