Commit 20f4cfbc authored by Holger Brand's avatar Holger Brand
Browse files

Build with new CSPP_Core modifications. (AsyncCallback, CSPP_TDMSSTorage)

parent f83ceb99
Subproject commit d842ddd0a52568b328984a54d7244cdf2f651c38 Subproject commit 8315ee0c69c9d6cfb164760f5a561e4d324e80f9
Subproject commit 5e49e8664cec526f217d90a5e6e9e1cc18f97fa9
Subproject commit 39b4777ecdd5663c82cf9c1244852053ea32fec2 Subproject commit 567b7a79cfb3689d5501dc0ec947c995846f9168
...@@ -1051,12 +1051,12 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1051,12 +1051,12 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="BNT" Type="Folder"> <Item Name="BNT" Type="Folder">
<Item Name="BNT_DAQmx-Content.vi" Type="VI" URL="../Packages/BNT_DAQmx/BNT_DAQmx-Content.vi"/> <Item Name="BNT_DAQmx-Content.vi" Type="VI" URL="../Packages/BNT_DAQmx/BNT_DAQmx-Content.vi"/>
<Item Name="BNT_DAQmx.lvlib" Type="Library" URL="../Packages/BNT_DAQmx/BNT_DAQmx.lvlib"/> <Item Name="BNT_DAQmx.lvlib" Type="Library" URL="../Packages/BNT_DAQmx/BNT_DAQmx.lvlib"/>
<Item Name="BNT_TDMS.lvlib" Type="Library" URL="../Packages/BNT_TDMS/BNT_TDMS.lvlib"/>
</Item> </Item>
<Item Name="CSPP" Type="Folder"> <Item Name="CSPP" Type="Folder">
<Item Name="Core" Type="Folder"> <Item Name="Core" Type="Folder">
<Item Name="Abstract-Messages" Type="Folder"> <Item Name="Abstract-Messages" Type="Folder">
<Item Name="CSPP_AEUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AEUpdate Msg/CSPP_AEUpdate Msg.lvlib"/> <Item Name="CSPP_AEUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AEUpdate Msg/CSPP_AEUpdate Msg.lvlib"/>
<Item Name="CSPP_AsyncCallbackMsg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AsyncCallbackMsg/CSPP_AsyncCallbackMsg.lvlib"/>
<Item Name="CSPP_DataUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_DataUpdate Msg/CSPP_DataUpdate Msg.lvlib"/> <Item Name="CSPP_DataUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_DataUpdate Msg/CSPP_DataUpdate Msg.lvlib"/>
<Item Name="CSPP_PVUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_PVUpdate Msg/CSPP_PVUpdate Msg.lvlib"/> <Item Name="CSPP_PVUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_PVUpdate Msg/CSPP_PVUpdate Msg.lvlib"/>
</Item> </Item>
...@@ -1070,6 +1070,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1070,6 +1070,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="CSPP_PVProxy.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_PVProxy/CSPP_PVProxy.lvlib"/> <Item Name="CSPP_PVProxy.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_PVProxy/CSPP_PVProxy.lvlib"/>
<Item Name="CSPP_StartActor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_StartActor/CSPP_StartActor.lvlib"/> <Item Name="CSPP_StartActor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_StartActor/CSPP_StartActor.lvlib"/>
<Item Name="CSPP_SVMonitor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_SVMonitor/CSPP_SVMonitor.lvlib"/> <Item Name="CSPP_SVMonitor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_SVMonitor/CSPP_SVMonitor.lvlib"/>
<Item Name="CSPP_TDMSStorage.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_TDMSStorage/CSPP_TDMSStorage.lvlib"/>
</Item> </Item>
<Item Name="Classes" Type="Folder"> <Item Name="Classes" Type="Folder">
<Item Name="CSPP_BaseClasses.lvlib" Type="Library" URL="../Packages/CSPP_Core/Classes/CSPP_BaseClasses/CSPP_BaseClasses.lvlib"/> <Item Name="CSPP_BaseClasses.lvlib" Type="Library" URL="../Packages/CSPP_Core/Classes/CSPP_BaseClasses/CSPP_BaseClasses.lvlib"/>
...@@ -1108,6 +1109,9 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1108,6 +1109,9 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="CSPP_Syslog.lvlib" Type="Library" URL="../Packages/CSPP_Syslog/CSPP_Syslog.lvlib"/> <Item Name="CSPP_Syslog.lvlib" Type="Library" URL="../Packages/CSPP_Syslog/CSPP_Syslog.lvlib"/>
</Item> </Item>
</Item> </Item>
<Item Name="instr.lib" Type="Folder">
<Item Name="Leybold 23xxx2.lvlib" Type="Library" URL="/&lt;instrlib&gt;/Leybold23xxx2/Leybold 23xxx2.lvlib"/>
</Item>
<Item Name="Test" Type="Folder"> <Item Name="Test" Type="Folder">
<Item Name="Test DIO FPB.vi" Type="VI" URL="../Host/Test DIO FPB.vi"/> <Item Name="Test DIO FPB.vi" Type="VI" URL="../Host/Test DIO FPB.vi"/>
<Item Name="Test Fuzzy System.vi" Type="VI" URL="../Host/Test Fuzzy System.vi"/> <Item Name="Test Fuzzy System.vi" Type="VI" URL="../Host/Test Fuzzy System.vi"/>
...@@ -1129,9 +1133,6 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1129,9 +1133,6 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="UHV-HeatControl-Host.ini" Type="Document" URL="../UHV-HeatControl-Host.ini"/> <Item Name="UHV-HeatControl-Host.ini" Type="Document" URL="../UHV-HeatControl-Host.ini"/>
<Item Name="UHV_HC-Main.vi" Type="VI" URL="../Packages/UHV_HeatControl/UHV_HC-Main.vi"/> <Item Name="UHV_HC-Main.vi" Type="VI" URL="../Packages/UHV_HeatControl/UHV_HC-Main.vi"/>
<Item Name="Dependencies" Type="Dependencies"> <Item Name="Dependencies" Type="Dependencies">
<Item Name="instr.lib" Type="Folder">
<Item Name="Leybold 23xxx2.lvlib" Type="Library" URL="/&lt;instrlib&gt;/Leybold23xxx2/Leybold 23xxx2.lvlib"/>
</Item>
<Item Name="vi.lib" Type="Folder"> <Item Name="vi.lib" Type="Folder">
<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/> <Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
<Item Name="ALM_Clear_UD_Alarm.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Clear_UD_Alarm.vi"/> <Item Name="ALM_Clear_UD_Alarm.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/alarm/internal/ALM_Clear_UD_Alarm.vi"/>
...@@ -1518,6 +1519,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1518,6 +1519,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="systemLogging.dll" Type="Document" URL="systemLogging.dll"> <Item Name="systemLogging.dll" Type="Document" URL="systemLogging.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property> <Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item> </Item>
<Item Name="TDMS-Actor.lvclass" Type="LVClass" URL="../Packages/BNT_TDMS/TDMSActor/TDMS-Actor.lvclass"/>
<Item Name="version.dll" Type="Document" URL="version.dll"> <Item Name="version.dll" Type="Document" URL="version.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property> <Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item> </Item>
......
...@@ -39,8 +39,8 @@ LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass" ...@@ -39,8 +39,8 @@ LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
LVClassPath="CSPP_DSCMonitor.lvlib:CSPP_DSCMonitor.lvclass" LVClassPath="CSPP_DSCMonitor.lvlib:CSPP_DSCMonitor.lvclass"
[UHVHCRT] [UHVHCRT]
#UHVHC_Main="UHVHC-dveert04" UHVHC_Main="UHVHC-dveert04"
UHVHC_Main="UHVHC-uhvpxi003" #UHVHC_Main="UHVHC-uhvpxi003"
[UHVHC] [UHVHC]
LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass" LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass"
......
...@@ -1085,7 +1085,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property> ...@@ -1085,7 +1085,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
</Item> </Item>
<Item Name="uhvpxi003" Type="RT PXI Chassis"> <Item Name="uhvpxi003" Type="RT PXI Chassis">
<Property Name="alias.name" Type="Str">uhvpxi003</Property> <Property Name="alias.name" Type="Str">uhvpxi003</Property>
<Property Name="alias.value" Type="Str">140.181.72.140</Property> <Property Name="alias.value" Type="Str">140.181.72.3</Property>
<Property Name="CCSymbols" Type="Str">TARGET_TYPE,RT;OS,PharLap;CPU,x86;</Property> <Property Name="CCSymbols" Type="Str">TARGET_TYPE,RT;OS,PharLap;CPU,x86;</Property>
<Property Name="host.ResponsivenessCheckEnabled" Type="Bool">true</Property> <Property Name="host.ResponsivenessCheckEnabled" Type="Bool">true</Property>
<Property Name="host.ResponsivenessCheckPingDelay" Type="UInt">5000</Property> <Property Name="host.ResponsivenessCheckPingDelay" Type="UInt">5000</Property>
...@@ -1168,12 +1168,13 @@ AddOutputFilter chunkFilter ...@@ -1168,12 +1168,13 @@ AddOutputFilter chunkFilter
<Item Name="BNT" Type="Folder"> <Item Name="BNT" Type="Folder">
<Item Name="BNT_DAQmx-Content.vi" Type="VI" URL="../Packages/BNT_DAQmx/BNT_DAQmx-Content.vi"/> <Item Name="BNT_DAQmx-Content.vi" Type="VI" URL="../Packages/BNT_DAQmx/BNT_DAQmx-Content.vi"/>
<Item Name="BNT_DAQmx.lvlib" Type="Library" URL="../Packages/BNT_DAQmx/BNT_DAQmx.lvlib"/> <Item Name="BNT_DAQmx.lvlib" Type="Library" URL="../Packages/BNT_DAQmx/BNT_DAQmx.lvlib"/>
<Item Name="BNT_TDMS.lvlib" Type="Library" URL="../Packages/BNT_TDMS/BNT_TDMS.lvlib"/>
</Item> </Item>
<Item Name="CSPP" Type="Folder"> <Item Name="CSPP" Type="Folder">
<Item Name="Core" Type="Folder"> <Item Name="Core" Type="Folder">
<Item Name="Abstract-Messages" Type="Folder"> <Item Name="Abstract-Messages" Type="Folder">
<Item Name="CSPP_AEUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AEUpdate Msg/CSPP_AEUpdate Msg.lvlib"/> <Item Name="CSPP_AEUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AEUpdate Msg/CSPP_AEUpdate Msg.lvlib"/>
<Item Name="CSPP_AsyncCallbackMsg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AsyncCallbackMsg/CSPP_AsyncCallbackMsg.lvlib"/>
<Item Name="CSPP_DataUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_DataUpdate Msg/CSPP_DataUpdate Msg.lvlib"/>
<Item Name="CSPP_PVUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_PVUpdate Msg/CSPP_PVUpdate Msg.lvlib"/> <Item Name="CSPP_PVUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_PVUpdate Msg/CSPP_PVUpdate Msg.lvlib"/>
</Item> </Item>
<Item Name="Actors" Type="Folder"> <Item Name="Actors" Type="Folder">
...@@ -1217,6 +1218,9 @@ AddOutputFilter chunkFilter ...@@ -1217,6 +1218,9 @@ AddOutputFilter chunkFilter
<Item Name="CSPP_Syslog.lvlib" Type="Library" URL="../Packages/CSPP_Syslog/CSPP_Syslog.lvlib"/> <Item Name="CSPP_Syslog.lvlib" Type="Library" URL="../Packages/CSPP_Syslog/CSPP_Syslog.lvlib"/>
</Item> </Item>
</Item> </Item>
<Item Name="Instr.lib" Type="Folder">
<Item Name="Leybold 23xxx2.lvlib" Type="Library" URL="/&lt;instrlib&gt;/Leybold23xxx2/Leybold 23xxx2.lvlib"/>
</Item>
<Item Name="Test" Type="Folder"> <Item Name="Test" Type="Folder">
<Item Name="Test DIO on RT.vi" Type="VI" URL="../RT/Test DIO on RT.vi"/> <Item Name="Test DIO on RT.vi" Type="VI" URL="../RT/Test DIO on RT.vi"/>
</Item> </Item>
...@@ -1233,9 +1237,6 @@ AddOutputFilter chunkFilter ...@@ -1233,9 +1237,6 @@ AddOutputFilter chunkFilter
<Item Name="UHV-HeatControl-RT.ini" Type="Document" URL="../UHV-HeatControl-RT.ini"/> <Item Name="UHV-HeatControl-RT.ini" Type="Document" URL="../UHV-HeatControl-RT.ini"/>
<Item Name="UHV_HCRT-Main.vi" Type="VI" URL="../Packages/UHV_HeatControl/UHV_HCRT-Main.vi"/> <Item Name="UHV_HCRT-Main.vi" Type="VI" URL="../Packages/UHV_HeatControl/UHV_HCRT-Main.vi"/>
<Item Name="Dependencies" Type="Dependencies"> <Item Name="Dependencies" Type="Dependencies">
<Item Name="instr.lib" Type="Folder">
<Item Name="Leybold 23xxx2.lvlib" Type="Library" URL="/&lt;instrlib&gt;/Leybold23xxx2/Leybold 23xxx2.lvlib"/>
</Item>
<Item Name="vi.lib" Type="Folder"> <Item Name="vi.lib" Type="Folder">
<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/> <Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/> <Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
...@@ -1519,12 +1520,14 @@ AddOutputFilter chunkFilter ...@@ -1519,12 +1520,14 @@ AddOutputFilter chunkFilter
<Item Name="Write to XML File(string).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/xml.llb/Write to XML File(string).vi"/> <Item Name="Write to XML File(string).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/xml.llb/Write to XML File(string).vi"/>
<Item Name="Write to XML File.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/xml.llb/Write to XML File.vi"/> <Item Name="Write to XML File.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/xml.llb/Write to XML File.vi"/>
</Item> </Item>
<Item Name="CSPP_DataUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_DataUpdate Msg/CSPP_DataUpdate Msg.lvlib"/>
<Item Name="CSPP_GUIActor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_GUIActor/CSPP_GUIActor.lvlib"/> <Item Name="CSPP_GUIActor.lvlib" Type="Library" URL="../Packages/CSPP_Core/Actors/CSPP_GUIActor/CSPP_GUIActor.lvlib"/>
<Item Name="LV Config Read String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read String.vi"/> <Item Name="LV Config Read String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read String.vi"/>
<Item Name="nilvaiu.dll" Type="Document" URL="nilvaiu.dll"> <Item Name="nilvaiu.dll" Type="Document" URL="nilvaiu.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property> <Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item> </Item>
<Item Name="nisyscfg.dll" Type="Document" URL="nisyscfg.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="niwd4c.dll" Type="Document" URL="niwd4c.dll"> <Item Name="niwd4c.dll" Type="Document" URL="niwd4c.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property> <Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item> </Item>
...@@ -1550,7 +1553,7 @@ AddOutputFilter chunkFilter ...@@ -1550,7 +1553,7 @@ AddOutputFilter chunkFilter
<Property Name="Bld_previewCacheID" Type="Str">{DAAD5904-A2C8-461F-912D-1218F53AD35F}</Property> <Property Name="Bld_previewCacheID" Type="Str">{DAAD5904-A2C8-461F-912D-1218F53AD35F}</Property>
<Property Name="Bld_targetDestDir" Type="Path">/c/ni-rt/startup</Property> <Property Name="Bld_targetDestDir" Type="Path">/c/ni-rt/startup</Property>
<Property Name="Bld_userLogFile" Type="Path">/G/builds/UHVHC/RT/uhvpxi003/UHVHCRT_log.txt</Property> <Property Name="Bld_userLogFile" Type="Path">/G/builds/UHVHC/RT/uhvpxi003/UHVHCRT_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">45</Property> <Property Name="Bld_version.build" Type="Int">49</Property>
<Property Name="Bld_version.major" Type="Int">1</Property> <Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">startup.rtexe</Property> <Property Name="Destination[0].destName" Type="Str">startup.rtexe</Property>
<Property Name="Destination[0].path" Type="Path">/c/ni-rt/startup/startup.rtexe</Property> <Property Name="Destination[0].path" Type="Path">/c/ni-rt/startup/startup.rtexe</Property>
......
Supports Markdown
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