Commit 5bd6edc9 authored by Dennis Neidherr's avatar Dennis Neidherr 😲
Browse files

Merge remote-tracking branch 'origin/feature/HB2021' into DNDev

# Conflicts:
#	Actors/CSPP_GUIActor/Dispatch PVMonitors - 2D.vi
#	Actors/CSPP_GUIActor/Dispatch PVMonitors.vi
#	Actors/CSPP_PVProxy/Initialize Attributes Core.vi
#	Classes/CSPP_ProcessVariables/ProcessVariable/Read PV URL.vi
parents 3fd7f8da b6fc4244
This diff is collapsed.
This diff is collapsed.
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="19008000">
<Library LVVersion="21008000">
<Property Name="Alarm Database Computer" Type="Str">localhost</Property>
<Property Name="Alarm Database Name" Type="Str">C__Program_Files_National_Instruments_LabVIEW_2012_data</Property>
<Property Name="Alarm Database Path" Type="Str">C:\Program Files\National Instruments\LabVIEW 2012\data</Property>
......@@ -30,8 +30,8 @@ Sofern nicht durch anwendbare Rechtsvorschriften gefordert oder in schriftlicher
Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind dem Lizenztext zu entnehmen.</Property>
<Property Name="NI.Lib.HelpPath" Type="Str"></Property>
<Property Name="NI.Lib.Icon" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!*/!!!*Q(C=\&gt;7R&lt;&gt;N!&amp;-&lt;RTY',6);UA3&amp;E!?/NI%9$;)7XAO$/J5&lt;)[V)ED6:1EQ%?MI'!4-!6G0]&gt;HSGFM1QE2F+9V+/J\YZX0Z%(7OL&lt;2_F7Y\6N]?,WGP&lt;?ZX+EM:,JU(IMJM:RKPK=W_?"RLH/H;;4ZW#_@L+@;VT]0P`&amp;*(`Y_VZOP\,J@8P@`OXW&gt;(72PPG;P6&amp;\%6&amp;*"?75K5UV*HG3*XG3*XG3"XG1"XG1"XG1/\G4/\G4/\G4'\G2'\G2'\G2^ZV=Z#)8/;2E]G3C:."EA+1T&amp;#7(R*.Y%E`CY;M34_**0)EH]&gt;"&amp;C3@R**\%EXCY4)EH]33?R*.Y'+J,MO`E?")0QSPQ"*\!%XA#$V-K]!3!9,*AY'!1'!I;AZ0!%XA#$[=+0)%H]!3?Q%/T!E`A#4S"*`"Q3&lt;]LU46N*]@$-()]DM@R/"\(Q^"S0)\(]4A?R].U=DS/RU%Y%TK$1Z"TE&gt;0"_?*Y(!^`Z(A=D_.R0)[(JP[%P._:JGE\/2\$9XA-D_%R0!QBQW.Y$)`B-4Q-+].D?!S0Y4%]4#8$9XA-DQ%R*G6['9-:&amp;RK&gt;D-$Q]/GLR@J4CC[RPEOV?&amp;7,5L896)N)N4B5$VXV-&amp;50388T64&gt;6&gt;&lt;.5.U(VYV2I&amp;59VC?LCVF%$RR.VJ!\5HNJ27WJ.L;BFO`1P&gt;RS'1;@43=@D59@$1@P^8LP&gt;4NPN6OPV7KP63MPF=HY.X,00,Y4JP@4%?;P00_]?PNVO(L\]'$:@0WU?Y`P&gt;ZLGNV2P^,`U0XIX[I-NRO5?`!!RE=89!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">419463168</Property>
<Property Name="NI.Lib.Icon" Type="Bin">)1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!*/!!!*Q(C=\&gt;7R&lt;&gt;N!&amp;-&lt;RTY',6);UA3&amp;E!?/NI%9$;)7XAO$/J5&lt;)[V)ED6:1EQ%?MI'!4-!6G0]&gt;HSGFM1QE2F+9V+/J\YZX0Z%(7OL&lt;2_F7Y\6N]?,WGP&lt;?ZX+EM:,JU(IMJM:RKPK=W_?"RLH/H;;4ZW#_@L+@;VT]0P`&amp;*(`Y_VZOP\,J@8P@`OXW&gt;(72PPG;P6&amp;\%6&amp;*"?75K5UV*HG3*XG3*XG3"XG1"XG1"XG1/\G4/\G4/\G4'\G2'\G2'\G2^ZV=Z#)8/;2E]G3C:."EA+1T&amp;#7(R*.Y%E`CY;M34_**0)EH]&gt;"&amp;C3@R**\%EXCY4)EH]33?R*.Y'+J,MO`E?")0QSPQ"*\!%XA#$V-K]!3!9,*AY'!1'!I;AZ0!%XA#$[=+0)%H]!3?Q%/T!E`A#4S"*`"Q3&lt;]LU46N*]@$-()]DM@R/"\(Q^"S0)\(]4A?R].U=DS/RU%Y%TK$1Z"TE&gt;0"_?*Y(!^`Z(A=D_.R0)[(JP[%P._:JGE\/2\$9XA-D_%R0!QBQW.Y$)`B-4Q-+].D?!S0Y4%]4#8$9XA-DQ%R*G6['9-:&amp;RK&gt;D-$Q]/GLR@J4CC[RPEOV?&amp;7,5L896)N)N4B5$VXV-&amp;50388T64&gt;6&gt;&lt;.5.U(VYV2I&amp;59VC?LCVF%$RR.VJ!\5HNJ27WJ.L;BFO`1P&gt;RS'1;@43=@D59@$1@P^8LP&gt;4NPN6OPV7KP63MPF=HY.X,00,Y4JP@4%?;P00_]?PNVO(L\]'$:@0WU?Y`P&gt;ZLGNV2P^,`U0XIX[I-NRO5?`!!RE=89!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">553680896</Property>
<Property Name="NI.Lib.Version" Type="Str">1.5.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="NI.SortType" Type="Int">3</Property>
......@@ -53,7 +53,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="OdbcStringLoggingTableName" Type="Str">NI_VARIABLE_STRING</Property>
<Property Name="OdbcUsername" Type="Str"></Property>
<Property Name="SaveStatePeriod" Type="UInt">0</Property>
<Property Name="Serialized ACL" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!A1%!!!@````]!!".V&lt;H.J:WZF:#"C?82F)'&amp;S=G&amp;Z!!%!!1!!!!A)!!!!#!!!!!!!!!!</Property>
<Property Name="Serialized ACL" Type="Bin">)1#!!!!!!!)!"1!&amp;!!!A1%!!!@````]!!".V&lt;H.J:WZF:#"C?82F)'&amp;S=G&amp;Z!!%!!1!!!!A)!!!!#!!!!!!!!!!</Property>
<Property Name="Use Data Logging Database" Type="Bool">true</Property>
<Item Name="Messages" Type="Folder">
<Property Name="NI.SortType" Type="Int">0</Property>
......@@ -76,6 +76,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="Publish NofMsgsInPQ Msg.lvclass" Type="LVClass" URL="../../CSPP_BaseActor Messages/Publish NofMsgsInPQ Msg/Publish NofMsgsInPQ Msg.lvclass"/>
<Item Name="Settings Msg.lvclass" Type="LVClass" URL="../../CSPP_BaseActor Messages/Settings Msg/Settings Msg.lvclass"/>
<Item Name="Stop PVProxy Msg.lvclass" Type="LVClass" URL="../../CSPP_BaseActor Messages/Stop PVProxy Msg/Stop PVProxy Msg.lvclass"/>
<Item Name="Write CSPP_DataUpdate Msg Msg.lvclass" Type="LVClass" URL="../../CSPP_BaseActor Messages/Write CSPP_DataUpdate Msg Msg/Write CSPP_DataUpdate Msg Msg.lvclass"/>
<Item Name="Write Watchdog Enqueuer Msg.lvclass" Type="LVClass" URL="../../CSPP_BaseActor Messages/Write Watchdog Enqueuer Msg/Write Watchdog Enqueuer Msg.lvclass"/>
</Item>
<Item Name="CSPP_BaseActor.lvclass" Type="LVClass" URL="../CSPP_BaseActor.lvclass"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment