Skip to content

GitLab

Commit 92e80c2d authored by Holger Brand's avatar Holger Brand
Browse files
Options

Rebuild RT.exe

parent 3ce8132c
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 61 deletions
CSPP_Core @ 18365264
Compare d8051890...18365264
Subproject commit d80518902196bf5c2744c7b2dd43daae1dcc4042
Subproject commit 18365264422f4cb8846abec1cabe834bd039c287
UHV-HeatControl-RT.ini
View file @ 92e80c2d
......@@ -149,11 +149,11 @@ SPTemperature_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_0,n
[myDAQ]
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/Dev1"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/Dev1"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -208,11 +208,11 @@ Reset_Device_Msg="ni.var.psp://localhost/myDAQ/myDAQ_Reset"
Selftest_Device_Msg="ni.var.psp://localhost/myDAQ/myDAQ_SelfTest"
[myPWM]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/Dev1"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/Dev1"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.001
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -4012,7 +4012,7 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHC-FC0-Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\UHVHC Fuzzy System.fs"
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\\UHVHC Fuzzy System.fs"
[UHVHC-FC0.URLs]
FuzzySystem="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0_FuzzySystem"
FuzzySystemDescription="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0_FuzzySystemDescription"
......@@ -4029,11 +4029,11 @@ WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0-Proxy_WorkerActor"
Fuzzy_System_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0_Set-FuzzySystem"
[PXISlot2]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot2"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/PXI1Slot2"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -4146,11 +4146,11 @@ Selftest_Device_Msg="ni.var.psp://localhost/UHVHC-DAQ/PXISlot2_SelfTest"
[PXISlot6]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="PXI1Slot6"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="PXI1Slot6"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.1
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -4465,7 +4465,7 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHC-FC1-Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\UHVHC Fuzzy System.fs"
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\\UHVHC Fuzzy System.fs"
[UHVHC-FC1.URLs]
FuzzySystem="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC1_FuzzySystem"
FuzzySystemDescription="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC1_FuzzySystemDescription"
......@@ -4482,11 +4482,11 @@ WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC1-Proxy_WorkerActor"
Fuzzy_System_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC1_Set-FuzzySystem"
[PXISlot3]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot3"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/PXI1Slot3"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -4598,11 +4598,11 @@ Selftest_Device_Msg="ni.var.psp://localhost/UHVHC-DAQ/PXISlot3_SelfTest"
[PXISlot7]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="PXI1Slot7"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="PXI1Slot7"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -4916,7 +4916,7 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHC-FC2-Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\UHVHC Fuzzy System.fs"
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\\UHVHC Fuzzy System.fs"
[UHVHC-FC2.URLs]
FuzzySystem="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC2_FuzzySystem"
FuzzySystemDescription="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC2_FuzzySystemDescription"
......@@ -4933,11 +4933,11 @@ WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC2-Proxy_WorkerActor"
Fuzzy_System_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC2_Set-FuzzySystem"
[PXISlot4]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot4"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/PXI1Slot4"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -5049,11 +5049,11 @@ Selftest_Device_Msg="ni.var.psp://localhost/UHVHC-DAQ/PXISlot4_SelfTest"
[PXISlot8]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="PXI1Slot8"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="PXI1Slot8"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -5367,7 +5367,7 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHC-FC3-Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\UHVHC Fuzzy System.fs"
UHVHC_FuzzyControl:UHVHC_FuzzyControl.FuzzySystemPath="C:\\UHVHC Fuzzy System.fs"
[UHVHC-FC3.URLs]
FuzzySystem="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC3_FuzzySystem"
FuzzySystemDescription="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC3_FuzzySystemDescription"
......@@ -5384,11 +5384,11 @@ WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC3-Proxy_WorkerActor"
Fuzzy_System_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC3_Set-FuzzySystem"
[PXISlot5]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot5"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="/PXI1Slot5"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -5500,11 +5500,11 @@ Selftest_Device_Msg="ni.var.psp://localhost/UHVHC-DAQ/PXISlot5_SelfTest"
[PXISlot9]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="PXI1Slot9"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="PXI1Slot9"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......
UHV-HeatControl-RT.lvproj
View file @ 92e80c2d
......@@ -5734,15 +5734,14 @@ AddOutputFilter chunkFilter
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_excludeTypedefs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/Brand/Builds/UHVHC/RT/NI_AB_TARGETNAME/UHVHCRT</Property>
<Property Name="Bld_localDestDir" Type="Path">/D/builds/UHVHC/RT/NI_AB_TARGETNAME/UHVHCRT</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</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_userLogFile" Type="Path">/D/Brand/Builds/UHVHC/RT/uhvpxi003/UHVHCRT_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">68</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/UHVHC/RT/uhvpxi003/UHVHCRT_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">2</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.minor" Type="Int">1</Property>
<Property Name="Bld_version.patch" Type="Int">1</Property>
<Property Name="Bld_version.minor" Type="Int">2</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" Type="Str">&lt;none&gt;</Property>
......@@ -5755,7 +5754,7 @@ AddOutputFilter chunkFilter
<Property Name="Destination[2].path" Type="Path">/c</Property>
<Property Name="Destination[2].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">3</Property>
<Property Name="Source[0].itemID" Type="Str">{B34755BD-F7C2-45FB-A33E-8169383D9FC4}</Property>
<Property Name="Source[0].itemID" Type="Str">{4A21DD8F-0A8E-4CF0-90D2-99E04269C221}</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">/SDPXIRT003/UHV_HCRT-Main.vi</Property>
......
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

https://git.gsi.de is provided by CIT-HPC | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy