Commit e6f709c4 authored by Holger Brand's avatar Holger Brand
Browse files

Merge remote-tracking branch 'origin/master' into HBDev

parents 02b34202 6dc04c87
Subproject commit 2337aa4f7d4d5805a0ec998a333d6bdaa77f0187
Subproject commit 4bf40258257d88ece2fbd40c3f87870dd1b61e33
......@@ -1238,16 +1238,17 @@ CSPP_PVScaler:CSPP_PVScaler.TypeDescriptor="Dbl"
#PollingMode="ni.var.psp://localhost/UTCS_Scaled/PScaler_PollingMode"
#PollingTime="ni.var.psp://localhost/UTCS_Scaled/PScaler_PollingTime"
[PScaler.ScaledURLs]
ScaledPV_0="ni.var.psp://localhost/UTCS_Scaled/TPG300-1_Pressure_2"
ScaledPV_1="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_0"
ScaledPV_2="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_2"
ScaledPV_3="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_0"
ScaledPV_4="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_2"
ScaledPV_5="ni.var.psp://localhost/UTCS_Scaled/TPG300-4_Pressure_0"
ScaledPV_6="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_1"
ScaledPV_7="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_3"
ScaledPV_8="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_1"
ScaledPV_9="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_3"
#Make sure that item follow lexical ordering. ScaledPV_009, _010,...,_099,_100, etc.
ScaledPV_00="ni.var.psp://localhost/UTCS_Scaled/TPG300-1_Pressure_2"
ScaledPV_01="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_0"
ScaledPV_02="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_2"
ScaledPV_03="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_0"
ScaledPV_04="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_2"
ScaledPV_05="ni.var.psp://localhost/UTCS_Scaled/TPG300-4_Pressure_0"
ScaledPV_06="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_1"
ScaledPV_07="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_3"
ScaledPV_08="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_1"
ScaledPV_09="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_3"
ScaledPV_10="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_0"
ScaledPV_11="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_1"
ScaledPV_12="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_2"
......
......@@ -918,6 +918,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="Utilities" Type="Folder">
<Item Name="Actors" Type="Folder">
<Item Name="CSPP_BeepActor.lvlib" Type="Library" URL="../Packages/CSPP_Utilities/Actors/CSPP_BeepActor/CSPP_BeepActor.lvlib"/>
<Item Name="CSPP_PVScaler.lvlib" Type="Library" URL="../Packages/CSPP_Utilities/Actors/CSPP_PVScaler/CSPP_PVScaler.lvlib"/>
</Item>
<Item Name="CSPP_Utilities.ini" Type="Document" URL="../Packages/CSPP_Utilities/CSPP_Utilities.ini"/>
<Item Name="CSPP_UtilitiesContent.vi" Type="VI" URL="../Packages/CSPP_Utilities/CSPP_UtilitiesContent.vi"/>
......@@ -2676,7 +2677,6 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="Advapi32.dll" Type="Document" URL="Advapi32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="CSPP_PVScaler.lvlib" Type="Library" URL="../Packages/CSPP_Utilities/Actors/CSPP_PVScaler/CSPP_PVScaler.lvlib"/>
<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
......
......@@ -1182,44 +1182,44 @@ CSPP_PVScaler:CSPP_PVScaler.TypeDescriptor="Dbl"
#PollingMode="ni.var.psp://localhost/CSPP_Core_SV/PScaler_PollingMode"
#PollingTime="ni.var.psp://localhost/CSPP_Core_SV/PScaler_PollingTime"
[PScaler.ScaledURLs]
ScaledPV_0="ni.var.psp://localhost/CSPP_Core_SV/TPG300-1_Pressure_2"
ScaledPV_1="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_0"
ScaledPV_2="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_2"
ScaledPV_3="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_0"
ScaledPV_4="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_2"
ScaledPV_5="ni.var.psp://localhost/CSPP_Core_SV/TPG300-4_Pressure_0"
ScaledPV_6="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_1"
ScaledPV_7="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_3"
ScaledPV_8="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_1"
ScaledPV_9="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_3"
ScaledPV_10="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_0"
ScaledPV_11="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_1"
ScaledPV_12="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_2"
ScaledPV_13="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_3"
ScaledPV_14="ni.var.psp://localhost/CSPP_Core_SV/BMIL_Det-Rate"
ScaledPV_15="ni.var.psp://localhost/CSPP_Core_SV/TASCAGC_Flow_0"
ScaledPV_16="ni.var.psp://localhost/CSPP_Core_SV/TASCAGC_Flow_1"
ScaledPV_17="ni.var.psp://localhost/CSPP_Core_SV/TASCAGC_Flow_2"
ScaledPV_18="ni.var.psp://localhost/CSPP_Core_SV/TASCAGC_Flow_3"
ScaledPV_19="ni.var.psp://localhost/CSPP_Core_SV/'GUT2DCX.currinfo_0'"
ScaledPV_20="ni.var.psp://localhost/CSPP_Core_SV/'GUX8DC2.currinfo_0'"
ScaledPV_21="ni.var.psp://localhost/CSPP_Core_SV/'GUX8DC4.currinfo_0'"
ScaledPV_22="ni.var.psp://localhost/CSPP_Core_SV/'GUX8DT3.currinfo_0'"
ScaledPV_23="ni.var.psp://localhost/CSPP_Core_SV/'GUXADT2.currinfo_0'"
ScaledPV_24="ni.var.psp://localhost/CSPP_Core_SV/'GUXIDC6.currinfo_0'"
ScaledPV_25="ni.var.psp://localhost/CSPP_Core_SV/BMIL_UX8DT3-I"
ScaledPV_26="ni.var.psp://localhost/CSPP_Core_SV/BMIL_UX8DT3-Q"
ScaledPV_27="ni.var.psp://localhost/CSPP_Core_SV/BMIL_UXADT2-I"
ScaledPV_28="ni.var.psp://localhost/CSPP_Core_SV/BMIL_UXADT2-Q"
ScaledPV_00="ni.var.psp://localhost/UTCS_Scaled/TPG300-1_Pressure_2"
ScaledPV_01="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_0"
ScaledPV_02="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_2"
ScaledPV_03="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_0"
ScaledPV_04="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_2"
ScaledPV_05="ni.var.psp://localhost/UTCS_Scaled/TPG300-4_Pressure_0"
ScaledPV_06="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_1"
ScaledPV_07="ni.var.psp://localhost/UTCS_Scaled/TPG300-2_Pressure_3"
ScaledPV_08="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_1"
ScaledPV_09="ni.var.psp://localhost/UTCS_Scaled/TPG300-3_Pressure_3"
ScaledPV_10="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_0"
ScaledPV_11="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_1"
ScaledPV_12="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_2"
ScaledPV_13="ni.var.psp://localhost/UTCS_Scaled/TPG300-5_Pressure_3"
ScaledPV_14="ni.var.psp://localhost/UTCS_Scaled/BMIL_Det-Rate"
ScaledPV_15="ni.var.psp://localhost/UTCS_Scaled/TASCAGC_Flow_0"
ScaledPV_16="ni.var.psp://localhost/UTCS_Scaled/TASCAGC_Flow_1"
ScaledPV_17="ni.var.psp://localhost/UTCS_Scaled/TASCAGC_Flow_2"
ScaledPV_18="ni.var.psp://localhost/UTCS_Scaled/TASCAGC_Flow_3"
ScaledPV_19="ni.var.psp://localhost/UTCS_Scaled/GUT2DCX.currinfo_0"
ScaledPV_20="ni.var.psp://localhost/UTCS_Scaled/GUX8DC2.currinfo_0"
ScaledPV_21="ni.var.psp://localhost/UTCS_Scaled/GUX8DC4.currinfo_0"
ScaledPV_22="ni.var.psp://localhost/UTCS_Scaled/GUX8DT3.currinfo_0"
ScaledPV_23="ni.var.psp://localhost/UTCS_Scaled/GUXADT2.currinfo_0"
ScaledPV_24="ni.var.psp://localhost/UTCS_Scaled/GUXIDC6.currinfo_0"
ScaledPV_25="ni.var.psp://localhost/UTCS_Scaled/BMIL_UX8DT3-I"
ScaledPV_26="ni.var.psp://localhost/UTCS_Scaled/BMIL_UX8DT3-Q"
ScaledPV_27="ni.var.psp://localhost/UTCS_Scaled/BMIL_UXADT2-I"
ScaledPV_28="ni.var.psp://localhost/UTCS_Scaled/BMIL_UXADT2-Q"
[PScalerProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="PScaler"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[PScalerProxy.URLs]
Activate="ni.var.psp://localhost/CSPP_Core_SV/PScalerProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP_Core_SV/PScalerProxy_WorkerActor|1024?.1"
#Polling_Interval_Msg="ni.var.psp://localhost/CSPP_Core_SV/PScaler_Set-PollingInterval?.1"
#Polling_Iterations_Msg="ni.var.psp://localhost/CSPP_Core_SV/PScaler_Set-PollingIterations?.1"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP_Core_SV/PScaler_Set-PollingStartStop?.1"
Scale_PV_Msg="ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-1_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-4_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_3,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_3,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_3,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_Det-Rate,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_0,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_1,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_2,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_3,ni.var.psp://KCPC080/UTCS_AccIO/'GUT2DCX.currinfo_0',ni.var.psp://KCPC080/UTCS_AccIO/'GUX8DC2.currinfo_0',ni.var.psp://KCPC080/UTCS_AccIO/'GUX8DC4.currinfo_0',ni.var.psp://KCPC080/UTCS_AccIO/'GUX8DT3.currinfo_0',ni.var.psp://KCPC080/UTCS_AccIO/'GUXADT2.currinfo_0',ni.var.psp://KCPC080/UTCS_AccIO/'GUXIDC6.currinfo_0',ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UX8DT3-I,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UX8DT3-Q,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UXADT2-I,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UXADT2-Q"
Activate="ni.var.psp://localhost/UTCS_Scaled/PScalerProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/UTCS_Scaled/PScalerProxy_WorkerActor|1024?.1"
#Polling_Interval_Msg="ni.var.psp://localhost/UTCS_Scaled/PScaler_Set-PollingInterval?.1"
#Polling_Iterations_Msg="ni.var.psp://localhost/UTCS_Scaled/PScaler_Set-PollingIterations?.1"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/UTCS_Scaled/PScaler_Set-PollingStartStop?.1"
Scale_PV_Msg="ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-1_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-4_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_Pressure_3,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_Pressure_3,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_0,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_1,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_2,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_Pressure_3,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_Det-Rate,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_0,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_1,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_2,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_Flow_3,ni.var.psp://KCPC080/UTCS_AccIO/GUT2DCX.currinfo_0,ni.var.psp://KCPC080/UTCS_AccIO/GUX8DC2.currinfo_0,ni.var.psp://KCPC080/UTCS_AccIO/GUX8DC4.currinfo_0,ni.var.psp://KCPC080/UTCS_AccIO/GUX8DT3.currinfo_0,ni.var.psp://KCPC080/UTCS_AccIO/GUXADT2.currinfo_0,ni.var.psp://KCPC080/UTCS_AccIO/GUXIDC6.currinfo_0,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UX8DT3-I,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UX8DT3-Q,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UXADT2-I,ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_UXADT2-Q"
......@@ -2435,7 +2435,6 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="DAQmx Read (Analog 1D DBL 1Chan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 1D DBL 1Chan NSamp).vi"/>
<Item Name="DAQmx Read (Analog 1D DBL NChan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 1D DBL NChan 1Samp).vi"/>
<Item Name="DAQmx Read (Analog 1D Wfm NChan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 1D Wfm NChan 1Samp).vi"/>
<Item Name="DAQmx Read (Analog 1D Wfm NChan NSamp Duration).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 1D Wfm NChan NSamp Duration).vi"/>
<Item Name="DAQmx Read (Analog 1D Wfm NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 1D Wfm NChan NSamp).vi"/>
<Item Name="DAQmx Read (Analog 2D DBL NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 2D DBL NChan NSamp).vi"/>
<Item Name="DAQmx Read (Analog 2D I16 NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 2D I16 NChan NSamp).vi"/>
......@@ -2444,7 +2443,6 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="DAQmx Read (Analog 2D U32 NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog 2D U32 NChan NSamp).vi"/>
<Item Name="DAQmx Read (Analog DBL 1Chan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog DBL 1Chan 1Samp).vi"/>
<Item Name="DAQmx Read (Analog Wfm 1Chan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog Wfm 1Chan 1Samp).vi"/>
<Item Name="DAQmx Read (Analog Wfm 1Chan NSamp Duration).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog Wfm 1Chan NSamp Duration).vi"/>
<Item Name="DAQmx Read (Analog Wfm 1Chan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Analog Wfm 1Chan NSamp).vi"/>
<Item Name="DAQmx Read (Counter 1D DBL 1Chan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Counter 1D DBL 1Chan NSamp).vi"/>
<Item Name="DAQmx Read (Counter 1D DBL NChan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Counter 1D DBL NChan 1Samp).vi"/>
......@@ -2469,7 +2467,6 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="DAQmx Read (Digital 1D U32 1Chan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 1D U32 1Chan NSamp).vi"/>
<Item Name="DAQmx Read (Digital 1D U32 NChan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 1D U32 NChan 1Samp).vi"/>
<Item Name="DAQmx Read (Digital 1D Wfm NChan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 1D Wfm NChan 1Samp).vi"/>
<Item Name="DAQmx Read (Digital 1D Wfm NChan NSamp Duration).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 1D Wfm NChan NSamp Duration).vi"/>
<Item Name="DAQmx Read (Digital 1D Wfm NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 1D Wfm NChan NSamp).vi"/>
<Item Name="DAQmx Read (Digital 2D Bool NChan 1Samp NLine).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 2D Bool NChan 1Samp NLine).vi"/>
<Item Name="DAQmx Read (Digital 2D U8 NChan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital 2D U8 NChan NSamp).vi"/>
......@@ -2480,7 +2477,6 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="DAQmx Read (Digital U16 1Chan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital U16 1Chan 1Samp).vi"/>
<Item Name="DAQmx Read (Digital U32 1Chan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital U32 1Chan 1Samp).vi"/>
<Item Name="DAQmx Read (Digital Wfm 1Chan 1Samp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital Wfm 1Chan 1Samp).vi"/>
<Item Name="DAQmx Read (Digital Wfm 1Chan NSamp Duration).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital Wfm 1Chan NSamp Duration).vi"/>
<Item Name="DAQmx Read (Digital Wfm 1Chan NSamp).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Digital Wfm 1Chan NSamp).vi"/>
<Item Name="DAQmx Read (Raw 1D I8).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Raw 1D I8).vi"/>
<Item Name="DAQmx Read (Raw 1D I16).vi" Type="VI" URL="/&lt;vilib&gt;/DAQmx/read.llb/DAQmx Read (Raw 1D I16).vi"/>
......
......@@ -1242,16 +1242,17 @@ CSPP_PVScaler:CSPP_PVScaler.TypeDescriptor="Dbl"
#PollingMode="ni.var.psp://localhost/CSPP_Core_SV/PScaler_PollingMode"
#PollingTime="ni.var.psp://localhost/CSPP_Core_SV/PScaler_PollingTime"
[PScaler.ScaledURLs]
ScaledPV_0="ni.var.psp://localhost/CSPP_Core_SV/TPG300-1_Pressure_2"
ScaledPV_1="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_0"
ScaledPV_2="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_2"
ScaledPV_3="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_0"
ScaledPV_4="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_2"
ScaledPV_5="ni.var.psp://localhost/CSPP_Core_SV/TPG300-4_Pressure_0"
ScaledPV_6="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_1"
ScaledPV_7="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_3"
ScaledPV_8="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_1"
ScaledPV_9="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_3"
#Make sure that item follow lexical ordering. ScaledPV_009, _010,...,_099,_100, etc.
ScaledPV_00="ni.var.psp://localhost/CSPP_Core_SV/TPG300-1_Pressure_2"
ScaledPV_01="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_0"
ScaledPV_02="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_2"
ScaledPV_03="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_0"
ScaledPV_04="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_2"
ScaledPV_05="ni.var.psp://localhost/CSPP_Core_SV/TPG300-4_Pressure_0"
ScaledPV_06="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_1"
ScaledPV_07="ni.var.psp://localhost/CSPP_Core_SV/TPG300-2_Pressure_3"
ScaledPV_08="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_1"
ScaledPV_09="ni.var.psp://localhost/CSPP_Core_SV/TPG300-3_Pressure_3"
ScaledPV_10="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_0"
ScaledPV_11="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_1"
ScaledPV_12="ni.var.psp://localhost/CSPP_Core_SV/TPG300-5_Pressure_2"
......
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