Commit 6d436d11 authored by Holger Brand's avatar Holger Brand
Browse files

Update submodules; error handling for stopping nested actors

parent 1144a5ee
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="17008000">
<Project Type="Project" LVVersion="18008000">
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="NI.Project.Description" Type="Str">This is the AF/CS++ based project for the GSI Vacuum Heating System.
 
......@@ -7622,24 +7622,24 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Property Name="Bld_buildSpecName" Type="Str">UHVHC</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/UHVHC/Host/UHVHC</Property>
<Property Name="Bld_localDestDir" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC</Property>
<Property Name="Bld_previewCacheID" Type="Str">{45729B80-BAA7-4BCC-9339-37FB330FEC31}</Property>
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/UHVHC/Host/UHVHC/UHV-HeatControl-Host_UHVHC_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">24</Property>
<Property Name="Bld_userLogFile" Type="Path">/C/User/Brand/builds/UHV-HeatControl-Host/UHVHC/UHV-HeatControl-Host_UHVHC_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">26</Property>
<Property Name="Destination[0].destName" Type="Str">UHVHC.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/UHVHC/Host/UHVHC/UHVHC.exe</Property>
<Property Name="Destination[0].path" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC/UHVHC.exe</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">/D/builds/UHVHC/Host/UHVHC/data</Property>
<Property Name="Destination[1].path" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC/data</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Exe_cmdLineArgs" Type="Bool">true</Property>
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/UHVHC.ico</Property>
<Property Name="Source[0].itemID" Type="Str">{B86C55DF-947D-4CC1-BABF-502F4E1316C6}</Property>
<Property Name="Source[0].itemID" Type="Str">{09310CF5-855D-405C-A367-3B5B7BEF3303}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/UHV_HC-Main.vi</Property>
......@@ -7693,24 +7693,24 @@ http://zeitstempel.dfn.de/</Property>
<Property Name="Bld_buildSpecName" Type="Str">UHVHC-Signed</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/UHVHC-Signed/Host/UHVHC</Property>
<Property Name="Bld_localDestDir" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC-Signed</Property>
<Property Name="Bld_previewCacheID" Type="Str">{24DC92C6-264F-4891-B9CC-8BDB5DB92604}</Property>
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/UHVHC/Host/UHVHC/UHV-HeatControl-Host_UHVHC_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">31</Property>
<Property Name="Bld_userLogFile" Type="Path">/C/User/Brand/builds/UHV-HeatControl-Host/UHVHC-Signed/UHV-HeatControl-Host_UHVHC_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">34</Property>
<Property Name="Destination[0].destName" Type="Str">UHVHC.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/UHVHC-Signed/Host/UHVHC/UHVHC.exe</Property>
<Property Name="Destination[0].path" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC-Signed/UHVHC.exe</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">/D/builds/UHVHC-Signed/Host/UHVHC/data</Property>
<Property Name="Destination[1].path" Type="Path">/C/User/Brand/builds/NI_AB_PROJECTNAME/UHVHC-Signed/data</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Exe_cmdLineArgs" Type="Bool">true</Property>
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/UHVHC.ico</Property>
<Property Name="Source[0].itemID" Type="Str">{B86C55DF-947D-4CC1-BABF-502F4E1316C6}</Property>
<Property Name="Source[0].itemID" Type="Str">{9748F770-B77E-400F-B2B1-C4CF181AA354}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/UHV_HC-Main.vi</Property>
......@@ -7763,9 +7763,9 @@ http://zeitstempel.dfn.de/</Property>
<Property Name="DistPart[1].productName" Type="Str">NI Distributed System Manager 2017</Property>
<Property Name="DistPart[1].upgradeCode" Type="Str">{49570182-EFA6-4B4E-9181-572ECD14B262}</Property>
<Property Name="DistPart[2].flavorID" Type="Str">DefaultFull</Property>
<Property Name="DistPart[2].productID" Type="Str">{8393627D-0953-49B0-A9D6-EFBA9F400E2B}</Property>
<Property Name="DistPart[2].productName" Type="Str">NI LabVIEW DSC Module Runtime 2017 f2</Property>
<Property Name="DistPart[2].upgradeCode" Type="Str">{FEC48E37-9963-4534-9A12-D9448B97266D}</Property>
<Property Name="DistPart[2].productID" Type="Str">{29BFE214-952E-4460-9AC0-32D1AB41E4A6}</Property>
<Property Name="DistPart[2].productName" Type="Str">NI LabVIEW DSC Module Runtime 2018 f1</Property>
<Property Name="DistPart[2].upgradeCode" Type="Str">{12532B3A-9581-4948-ADE3-F171073AA7AA}</Property>
<Property Name="DistPart[3].flavorID" Type="Str">DefaultFull</Property>
<Property Name="DistPart[3].productID" Type="Str">{3011FA37-DCC4-4BF8-8900-12D68EC7996F}</Property>
<Property Name="DistPart[3].productName" Type="Str">NI Variable Engine 2017</Property>
......@@ -7775,49 +7775,40 @@ http://zeitstempel.dfn.de/</Property>
<Property Name="DistPart[4].productName" Type="Str">NI-DAQmx Runtime 17.6</Property>
<Property Name="DistPart[4].upgradeCode" Type="Str">{923C9CD5-A0D8-4147-9A8D-998780E30763}</Property>
<Property Name="DistPart[5].flavorID" Type="Str">DefaultFull</Property>
<Property Name="DistPart[5].productID" Type="Str">{D1B8EC89-0076-4C7E-A012-91427BC2873E}</Property>
<Property Name="DistPart[5].productName" Type="Str">NI LabVIEW Runtime 2017 SP1</Property>
<Property Name="DistPart[5].productID" Type="Str">{3B7FDD1A-EB93-4986-B111-7BBCC8D3CC28}</Property>
<Property Name="DistPart[5].productName" Type="Str">NI LabVIEW Runtime 2018 f1</Property>
<Property Name="DistPart[5].SoftDep[0].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[0].productName" Type="Str">NI LabVIEW Runtime 2017 SP1 Non-English Support.</Property>
<Property Name="DistPart[5].SoftDep[0].upgradeCode" Type="Str">{182AE811-85B6-4238-B67E-F19497CC186B}</Property>
<Property Name="DistPart[5].SoftDep[0].productName" Type="Str">NI ActiveX Container</Property>
<Property Name="DistPart[5].SoftDep[0].upgradeCode" Type="Str">{1038A887-23E1-4289-B0BD-0C4B83C6BA21}</Property>
<Property Name="DistPart[5].SoftDep[1].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[1].productName" Type="Str">NI ActiveX Container</Property>
<Property Name="DistPart[5].SoftDep[1].upgradeCode" Type="Str">{1038A887-23E1-4289-B0BD-0C4B83C6BA21}</Property>
<Property Name="DistPart[5].SoftDep[10].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[10].productName" Type="Str">NI mDNS Responder 14.0</Property>
<Property Name="DistPart[5].SoftDep[10].upgradeCode" Type="Str">{9607874B-4BB3-42CB-B450-A2F5EF60BA3B}</Property>
<Property Name="DistPart[5].SoftDep[11].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[11].productName" Type="Str">NI Deployment Framework 2017</Property>
<Property Name="DistPart[5].SoftDep[11].upgradeCode" Type="Str">{838942E4-B73C-492E-81A3-AA1E291FD0DC}</Property>
<Property Name="DistPart[5].SoftDep[12].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[12].productName" Type="Str">NI Error Reporting 2017</Property>
<Property Name="DistPart[5].SoftDep[12].upgradeCode" Type="Str">{42E818C6-2B08-4DE7-BD91-B0FD704C119A}</Property>
<Property Name="DistPart[5].SoftDep[1].productName" Type="Str">Math Kernel Libraries 2017</Property>
<Property Name="DistPart[5].SoftDep[1].upgradeCode" Type="Str">{699C1AC5-2CF2-4745-9674-B19536EBA8A3}</Property>
<Property Name="DistPart[5].SoftDep[2].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[2].productName" Type="Str">Math Kernel Libraries</Property>
<Property Name="DistPart[5].SoftDep[2].upgradeCode" Type="Str">{699C1AC5-2CF2-4745-9674-B19536EBA8A3}</Property>
<Property Name="DistPart[5].SoftDep[2].productName" Type="Str">NI Logos 18.0</Property>
<Property Name="DistPart[5].SoftDep[2].upgradeCode" Type="Str">{5E4A4CE3-4D06-11D4-8B22-006008C16337}</Property>
<Property Name="DistPart[5].SoftDep[3].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[3].productName" Type="Str">NI Logos 5.9</Property>
<Property Name="DistPart[5].SoftDep[3].upgradeCode" Type="Str">{5E4A4CE3-4D06-11D4-8B22-006008C16337}</Property>
<Property Name="DistPart[5].SoftDep[3].productName" Type="Str">NI TDM Streaming 18.0</Property>
<Property Name="DistPart[5].SoftDep[3].upgradeCode" Type="Str">{4CD11BE6-6BB7-4082-8A27-C13771BC309B}</Property>
<Property Name="DistPart[5].SoftDep[4].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[4].productName" Type="Str">NI TDM Streaming 17.0</Property>
<Property Name="DistPart[5].SoftDep[4].upgradeCode" Type="Str">{4CD11BE6-6BB7-4082-8A27-C13771BC309B}</Property>
<Property Name="DistPart[5].SoftDep[4].productName" Type="Str">NI LabVIEW Web Server 2018</Property>
<Property Name="DistPart[5].SoftDep[4].upgradeCode" Type="Str">{0960380B-EA86-4E0C-8B57-14CD8CCF2C15}</Property>
<Property Name="DistPart[5].SoftDep[5].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[5].productName" Type="Str">NI LabVIEW Web Server 2017</Property>
<Property Name="DistPart[5].SoftDep[5].upgradeCode" Type="Str">{0960380B-EA86-4E0C-8B57-14CD8CCF2C15}</Property>
<Property Name="DistPart[5].SoftDep[5].productName" Type="Str">NI VC2010MSMs</Property>
<Property Name="DistPart[5].SoftDep[5].upgradeCode" Type="Str">{EFBA6F9E-F934-4BD7-AC51-60CCA480489C}</Property>
<Property Name="DistPart[5].SoftDep[6].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[6].productName" Type="Str">NI LabVIEW Real-Time NBFifo 2017</Property>
<Property Name="DistPart[5].SoftDep[6].upgradeCode" Type="Str">{4F261250-2C38-488D-A9EC-9D1EFCC24D4B}</Property>
<Property Name="DistPart[5].SoftDep[6].productName" Type="Str">NI VC2015 Runtime</Property>
<Property Name="DistPart[5].SoftDep[6].upgradeCode" Type="Str">{D42E7BAE-6589-4570-B6A3-3E28889392E7}</Property>
<Property Name="DistPart[5].SoftDep[7].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[7].productName" Type="Str">NI VC2008MSMs</Property>
<Property Name="DistPart[5].SoftDep[7].upgradeCode" Type="Str">{FDA3F8BB-BAA9-45D7-8DC7-22E1F5C76315}</Property>
<Property Name="DistPart[5].SoftDep[7].productName" Type="Str">NI mDNS Responder 17.0</Property>
<Property Name="DistPart[5].SoftDep[7].upgradeCode" Type="Str">{9607874B-4BB3-42CB-B450-A2F5EF60BA3B}</Property>
<Property Name="DistPart[5].SoftDep[8].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[8].productName" Type="Str">NI VC2010MSMs</Property>
<Property Name="DistPart[5].SoftDep[8].upgradeCode" Type="Str">{EFBA6F9E-F934-4BD7-AC51-60CCA480489C}</Property>
<Property Name="DistPart[5].SoftDep[8].productName" Type="Str">NI Deployment Framework 2018</Property>
<Property Name="DistPart[5].SoftDep[8].upgradeCode" Type="Str">{838942E4-B73C-492E-81A3-AA1E291FD0DC}</Property>
<Property Name="DistPart[5].SoftDep[9].exclude" Type="Bool">false</Property>
<Property Name="DistPart[5].SoftDep[9].productName" Type="Str">NI VC2015 Runtime</Property>
<Property Name="DistPart[5].SoftDep[9].upgradeCode" Type="Str">{D42E7BAE-6589-4570-B6A3-3E28889392E7}</Property>
<Property Name="DistPart[5].SoftDepCount" Type="Int">13</Property>
<Property Name="DistPart[5].upgradeCode" Type="Str">{620DBAE1-B159-4204-8186-0813C8A6434C}</Property>
<Property Name="DistPart[5].SoftDep[9].productName" Type="Str">NI Error Reporting 2018</Property>
<Property Name="DistPart[5].SoftDep[9].upgradeCode" Type="Str">{42E818C6-2B08-4DE7-BD91-B0FD704C119A}</Property>
<Property Name="DistPart[5].SoftDepCount" Type="Int">10</Property>
<Property Name="DistPart[5].upgradeCode" Type="Str">{3B195EBF-4A09-46E6-8EAD-931568C1344C}</Property>
<Property Name="DistPart[6].flavorID" Type="Str">_full_</Property>
<Property Name="DistPart[6].productID" Type="Str">{C5BDA5B8-6D6E-44BD-AB4F-C14C09331604}</Property>
<Property Name="DistPart[6].productName" Type="Str">Microsoft Silverlight 5.1</Property>
......@@ -7838,7 +7829,7 @@ http://zeitstempel.dfn.de/</Property>
<Property Name="INST_productName" Type="Str">UHV-HeatControl</Property>
<Property Name="INST_productVersion" Type="Str">1.0.2</Property>
<Property Name="InstSpecBitness" Type="Str">32-bit</Property>
<Property Name="InstSpecVersion" Type="Str">17008011</Property>
<Property Name="InstSpecVersion" Type="Str">18008011</Property>
<Property Name="MSI_arpCompany" Type="Str">GSI Helmholtzzentrum für Schwerionenforschung GmbH</Property>
<Property Name="MSI_arpContact" Type="Str">H.Brand@gsi.de, G.Savino@gsi.de</Property>
<Property Name="MSI_arpPhone" Type="Str">2123, 2494</Property>
......@@ -27,8 +27,8 @@ ni.var.psp_e=SVMonitor
[SVMonitor]
LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
[UHVHCRT]
#UHVHC_Main="UHVHC-dveert04"
UHVHC_Main="UHVHC-uhvpxi003"
UHVHC_Main="UHVHC-dveert04"
#UHVHC_Main="UHVHC-uhvpxi003"
[UHVHC-dveert04]
LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_GUIActor.lvlib:CSPP_GUIActor.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