Commit 408fa1f9 authored by Holger Brand's avatar Holger Brand
Browse files

Make many VIs reentrant. Generate more log messages. Update submodules.

It works on depc456 (Desktop), dveert04 (PXI-8110) and uhvpxi003 (PXI-8109)  (1 AI, 1 FC, 1 DOPWM)
parent 774c074a
......@@ -116,6 +116,7 @@ ActorList="ni.var.psp://localhost/UHVHC/ActorList"
#UHVHC-GUI-dveert04=False
#UHVHC-GUI-uhvpxi003=False
[CSPP_StartActor.ActorList]
DSCAlarmViewer=False
DSCManager=False
UHVHC-GUI-uhvpxi003=False
UHVHC-GUI-dveert04=False
......@@ -366,8 +367,9 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:7"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1E-3
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
......
......@@ -7572,6 +7572,11 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="NI_Security Get Principals.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/security/user/NI_Security Get Principals.vi"/>
<Item Name="NI_Security_GetMemberList.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/security/internal/NI_Security_GetMemberList.vi"/>
<Item Name="NI_Security_GetMemberInfo_Name.vi" Type="VI" URL="/&lt;vilib&gt;/lvdsc/security/internal/NI_Security_GetMemberInfo_Name.vi"/>
<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
<Item Name="Set Cursor (Cursor ID).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Cursor ID).vi"/>
<Item Name="Set Cursor.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor.vi"/>
<Item Name="Set Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Busy.vi"/>
<Item Name="Unset Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Unset Busy.vi"/>
</Item>
<Item Name="Advapi32.dll" Type="Document" URL="Advapi32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
......@@ -7693,7 +7698,7 @@ http://zeitstempel.dfn.de/</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">21</Property>
<Property Name="Bld_version.build" Type="Int">25</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" Type="Str">&lt;none&gt;</Property>
......@@ -38,9 +38,9 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHCProxy-dveert04"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_Main:UHVHC_Main.Scaling_AI2T=10.
UHVHC_Main:UHVHC_Main.DAQAIActor="myDAQ"
UHVHC_Main:UHVHC_Main.DAQDOActor="myPWM"
UHVHC_Main:UHVHC_Main.Scaling_AI2T=10.
UHVHC_Main:UHVHC_Main.ControllerActor="UHVHC-FC0"
[UHVHC-dveert04.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingCounter?.1"
......@@ -162,6 +162,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:7"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1E-3
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
......@@ -302,13 +303,13 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHCProxy-uhvpxi003"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_Main:UHVHC_Main.DAQAIActor="PXISlot2,PXISlot3,PXISlot4,PXISlot5"
UHVHC_Main:UHVHC_Main.DAQDOActor="PXISlot6,PXISlot7,PXISlot8,PXISlot9"
#UHVHC_Main:UHVHC_Main.DAQAIActor="PXISlot2"
#UHVHC_Main:UHVHC_Main.DAQDOActor="PXISlot6"
UHVHC_Main:UHVHC_Main.Scaling_AI_2T=33.333
UHVHC_Main:UHVHC_Main.ControllerActor="UHVHC-FC0,UHVHC-FC1,UHVHC-FC2,UHVHC-FC3"
#UHVHC_Main:UHVHC_Main.ControllerActor="UHVHC-FC0"
#UHVHC_Main:UHVHC_Main.DAQAIActor="PXISlot2,PXISlot3,PXISlot4,PXISlot5"
#UHVHC_Main:UHVHC_Main.DAQDOActor="PXISlot6,PXISlot7,PXISlot8,PXISlot9"
#UHVHC_Main:UHVHC_Main.ControllerActor="UHVHC-FC0,UHVHC-FC1,UHVHC-FC2,UHVHC-FC3"
UHVHC_Main:UHVHC_Main.DAQAIActor="PXISlot2"
UHVHC_Main:UHVHC_Main.DAQDOActor="PXISlot6"
UHVHC_Main:UHVHC_Main.ControllerActor="UHVHC-FC0"
[UHVHC-uhvpxi003.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingDeltaT?.1"
......@@ -2187,6 +2188,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:63"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1E-1
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
......@@ -2293,7 +2295,7 @@ CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.001
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"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -2637,6 +2639,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:63"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
......@@ -2743,7 +2746,7 @@ CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.001
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"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -3087,6 +3090,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:63"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
......@@ -3193,7 +3197,7 @@ CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.001
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"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -3537,6 +3541,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Channels="AI0:63"
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
......@@ -3643,7 +3648,7 @@ CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.001
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"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......
This diff is collapsed.
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