Commit 1111e590 authored by Holger Brand's avatar Holger Brand
Browse files

Rebuild with averaged AI-Channels.

parent 164a0327
This diff is collapsed.
This diff is collapsed.
Subproject commit 0e73534a814fecd0f1ab0030fbb0bd09bd81cd57
Subproject commit c32d37d546c658b2b9be5f2f608e842d4184c77a
......@@ -112,7 +112,7 @@ ActorList="ni.var.psp://localhost/UHVHC/ActorList"
DSCAlarmViewer=True
UHVHC-depc456=False
UHVHC-GUI-depc456=False
#UHVHC-GUI-dveert04=False
UHVHC-GUI-dveert04=False
#UHVHC-GUI-UHVPXI003=False
[CSPP_StartActor.ActorList]
DSCManager=False
......@@ -349,7 +349,8 @@ Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0-Proxy_Activate"
WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0-Proxy_WorkerActor"
Fuzzy_System_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0_Set-FuzzySystem"
[myDAQ]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/Dev3"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
......@@ -365,6 +366,10 @@ 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-TerminalConfiguration=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[myDAQ.URLs]
PollingCounter="ni.var.psp://localhost/myDAQ/myDAQ_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/myDAQ/myDAQ_PollingDeltaT"
......
......@@ -4702,6 +4702,16 @@ Eine Kopie der Lizenz finden Sie hier: http://www.osor.eu/eupl</Property>
<Item Name="WDT Get XY Value DBL.vi" Type="VI" URL="/&lt;vilib&gt;/Waveform/WDTOps.llb/WDT Get XY Value DBL.vi"/>
<Item Name="Get XY Value.vi" Type="VI" URL="/&lt;vilib&gt;/Waveform/WDTOps.llb/Get XY Value.vi"/>
<Item Name="LVPoint32TypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVPoint32TypeDef.ctl"/>
<Item Name="DAQmx Timing (Pipelined Sample Clock).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Pipelined Sample Clock).vi"/>
<Item Name="DAQmx Timing (Burst Export Clock).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Burst Export Clock).vi"/>
<Item Name="DAQmx Timing (Burst Import Clock).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Burst Import Clock).vi"/>
<Item Name="DAQmx Timing (Change Detection).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Change Detection).vi"/>
<Item Name="DAQmx Timing (Use Waveform).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Use Waveform).vi"/>
<Item Name="DAQmx Timing (Implicit).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Implicit).vi"/>
<Item Name="DAQmx Timing (Handshaking).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Handshaking).vi"/>
<Item Name="DAQmx Timing (Sample Clock).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing (Sample Clock).vi"/>
<Item Name="DAQmx Timing.vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/timing.llb/DAQmx Timing.vi"/>
<Item Name="DAQmx Control Task.vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/configure/task.llb/DAQmx Control Task.vi"/>
</Item>
<Item Name="Advapi32.dll" Type="Document" URL="Advapi32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
......@@ -4823,7 +4833,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">19</Property>
<Property Name="Bld_version.build" Type="Int">21</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>
......
......@@ -146,7 +146,8 @@ PWMRatio_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PWMRatio_0,ni.var.psp:
SPTemperatures_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperatures"
SPTemperature_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_0,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_1,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_2,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_3,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_4,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_5,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_6,ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-SPTemperature_7"
[myDAQ]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
#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
......@@ -162,6 +163,10 @@ 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-TerminalConfiguration=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[myDAQ.URLs]
PollingCounter="ni.var.psp://localhost/myDAQ/myDAQ_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/myDAQ/myDAQ_PollingDeltaT"
......@@ -2164,7 +2169,7 @@ Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC0-Proxy_Activate"
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.lvclass"
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
......@@ -2180,6 +2185,10 @@ 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=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[PXISlot2.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-DAQ/PXISlot2_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/UHVHC-DAQ/PXISlot2_PollingDeltaT"
......@@ -2610,7 +2619,7 @@ Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC1-Proxy_Activate"
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.lvclass"
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
......@@ -2626,6 +2635,10 @@ 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=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[PXISlot3.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-DAQ/PXISlot3_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/UHVHC-DAQ/PXISlot3_PollingDeltaT"
......@@ -3056,7 +3069,7 @@ Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC2-Proxy_Activate"
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.lvclass"
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
......@@ -3072,6 +3085,10 @@ 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=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[PXISlot4.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-DAQ/PXISlot4_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/UHVHC-DAQ/PXISlot4_PollingDeltaT"
......@@ -3502,7 +3519,7 @@ Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHC-FC3-Proxy_Activate"
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.lvclass"
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSVAIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot2"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
......@@ -3518,6 +3535,10 @@ 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=-1
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=1000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=10000
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
[PXISlot5.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-DAQ/PXISlot5_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/UHVHC-DAQ/PXISlot5_PollingDeltaT"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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