Commit 774c074a authored by Holger Brand's avatar Holger Brand
Browse files

DVEERT04 works with reentrant IO-VIs. UHVPXI003 hs problemes with SV.

parent 836a8465
Subproject commit a32fa7c4f2b5de04da6ba852cebdfc86cc21be3c
Subproject commit 74caecd301617d279dc78d5518d37050f3e4a8cf
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -7622,7 +7622,7 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</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">22</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" Type="Str">&lt;none&gt;</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"
......@@ -40,7 +40,7 @@ CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHCProxy-dveert04"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_Main:UHVHC_Main.DAQAIActor="myDAQ"
UHVHC_Main:UHVHC_Main.DAQDOActor="myPWM"
UHVHC_Main:UHVHC_Main.Scaling_AI2T=33.3333
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"
......@@ -2178,7 +2178,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.
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -2188,7 +2188,7 @@ 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-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"
......@@ -2628,7 +2628,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.
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -2638,7 +2638,7 @@ 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-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"
......@@ -3078,7 +3078,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.
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -3088,7 +3088,7 @@ 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-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"
......@@ -3528,7 +3528,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.
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
......@@ -3538,7 +3538,7 @@ 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-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"
......
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