Commit 28a68b77 authored by Dennis Neidherr's avatar Dennis Neidherr 😲

Some updates while in Home Office...

parent a518932e
......@@ -143,7 +143,6 @@ LVClassPath="CSPP_FPGA-PPG.lvlib:CSPP_FPGA-PPG.lvclass"
#CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_PPGGUI.lvlib:CSPP_PPGGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="myFPGA-PPGGUI"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myFPGA-PPGProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
......@@ -292,6 +291,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=False
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
[myMMEventBuilder.URLs]
DataDescription="dim://localhost/myMMEventBuilder_dataDescription"
DataDescription2="dim://localhost/myMMEventBuilder_dataDescription2"
EventData="dim://localhost/myMMEventBuilder_eventData"
[myMMArchiver]
LVClassPath="CSPP_MMArchiver.lvlib:CSPP_MMArchiver.lvclass"
......@@ -302,11 +302,25 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myMMArchiverProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=False
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
[myMMArchiver.URLs]
NOfEvents="ni.var.psp://localhost/CSPP_MM_SV/myMMArchiver_nofEvents"
DataFile="ni.var.psp://localhost/CSPP_MM_SV/myMMArchiver_dataFile"
[myMMArchiverProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myMMArchiver"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[myMMArchiverProxy.URLs]
Activate="ni.var.psp://localhost/CSPP_MM_SV/myMMArchiverProxy_Activate"
#NewData_Msg="dim://localhost/myMMEventBuilder_eventData'{Dbl;Dbl;I32;Str**}'"
NewData_Msg="dim://localhost/myMMEventBuilder_eventData'Variant'"
NewDataDescription_Msg="dim://localhost/myMMEventBuilder_dataDescription'Variant'"
#NewDataDescription_Msg="dim://localhost/myMMEventBuilder_dataDescription'{Dbl;Str*32768;Str**}'"
[myDIM_PerfServer]
LVClassPath="CSPP_DIM_PerfServer.lvlib:CSPP_DIM_PerfServer.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -451,8 +465,7 @@ Error="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Error"
NumberOfChannels="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_NumberOfChannels"
#For all Channels:
#Channel_0:
#ACHTUNG WERT GEÄNDERT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Get_Voltage_0="lvnot://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_0"
Get_Voltage_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_0"
Get_OnOff_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_0"
Set_Voltage_0L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0L"
Set_Voltage_0H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0H"
......@@ -646,58 +659,58 @@ CSPP_ListGui:CSPP_ListGui.ShowFileMenu=True
[myISEG.URLs]
ResourceName="ni.var.psp://localhost/myProcess/myISEG_ResourceName"
DriverRevision="ni.var.psp://localhost/myProcess/myISEG_DriverRevision"
FirmwareRevision="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/FirmwareName"
FirmwareRevision="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/FirmwareName"
Error="ni.var.psp://localhost/myProcess/myISEG_Error"
NumberOfChannels="ni.var.psp://localhost/myProcess/myISEG_NumberOfChannels"
#For all Channels:
#Channel_P0:
Get_Voltage_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch00/VMeas"
Get_Current_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch00/IMeas"
Get_OnOff_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch00/On"
Set_Current_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch00/ISet"
Set_Voltage_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch00/VSet"
Get_Voltage_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch00/VMeas"
Get_Current_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch00/IMeas"
Get_OnOff_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch00/On"
Set_Current_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch00/ISet"
Set_Voltage_P0="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch00/VSet"
#Channel_P1:
Get_Voltage_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch01/VMeas"
Get_Current_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch01/IMeas"
Get_OnOff_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch01/On"
Set_Current_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch01/ISet"
Set_Voltage_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch01/VSet"
Get_Voltage_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch01/VMeas"
Get_Current_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch01/IMeas"
Get_OnOff_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch01/On"
Set_Current_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch01/ISet"
Set_Voltage_P1="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch01/VSet"
#Channel_P2:
Get_Voltage_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch02/VMeas"
Get_Current_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch02/IMeas"
Get_OnOff_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch02/On"
Set_Current_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch02/ISet"
Set_Voltage_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch02/VSet"
Get_Voltage_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch02/VMeas"
Get_Current_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch02/IMeas"
Get_OnOff_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch02/On"
Set_Current_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch02/ISet"
Set_Voltage_P2="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch02/VSet"
#Channel_P3:
Get_Voltage_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch03/VMeas"
Get_Current_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch03/IMeas"
Get_OnOff_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch03/On"
Set_Current_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch03/ISet"
Set_Voltage_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch03/VSet"
Get_Voltage_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch03/VMeas"
Get_Current_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch03/IMeas"
Get_OnOff_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch03/On"
Set_Current_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch03/ISet"
Set_Voltage_P3="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch03/VSet"
#Channel_P4:
Get_Voltage_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch04/VMeas"
Get_Current_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch04/IMeas"
Get_OnOff_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch04/On"
Set_Current_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch04/ISet"
Set_Voltage_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch04/VSet"
Get_Voltage_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch04/VMeas"
Get_Current_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch04/IMeas"
Get_OnOff_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch04/On"
Set_Current_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch04/ISet"
Set_Voltage_P4="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch04/VSet"
#Channel_P5:
Get_Voltage_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch05/VMeas"
Get_Current_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch05/IMeas"
Get_OnOff_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch05/On"
Set_Current_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch05/ISet"
Set_Voltage_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch05/VSet"
Get_Voltage_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch05/VMeas"
Get_Current_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch05/IMeas"
Get_OnOff_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch05/On"
Set_Current_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch05/ISet"
Set_Voltage_P5="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch05/VSet"
#Channel_P6:
Get_Voltage_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch06/VMeas"
Get_Current_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch06/IMeas"
Get_OnOff_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch06/On"
Set_Current_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch06/ISet"
Set_Voltage_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch06/VSet"
Get_Voltage_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch06/VMeas"
Get_Current_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch06/IMeas"
Get_OnOff_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch06/On"
Set_Current_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch06/ISet"
Set_Voltage_P6="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch06/VSet"
#Channel_P7:
Get_Voltage_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch07/VMeas"
Get_Current_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch07/IMeas"
Get_OnOff_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch07/On"
Set_Current_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch07/ISet"
Set_Voltage_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma44/ch07/VSet"
Get_Voltage_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch07/VMeas"
Get_Current_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch07/IMeas"
Get_OnOff_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch07/On"
Set_Current_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch07/ISet"
Set_Voltage_P7="ni.var.psp://DLPC105/ISEG/OPC/can0/ma58/ch07/VSet"
[myISEGProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
#CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DCPwrGui.lvlib:CSPP_DCPwrGui.lvclass"
......
......@@ -1116,7 +1116,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">../builds/CSPP-App_log.txt</Property>
<Property Name="Bld_userLogFile.pathType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_version.build" Type="Int">16</Property>
<Property Name="Bld_version.build" Type="Int">17</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">CSPP_HVSwitch2.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/CSPP_HVSwitch2/CSPP_HVSwitch2.exe</Property>
......@@ -1203,7 +1203,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">../builds/CSPP-App_log.txt</Property>
<Property Name="Bld_userLogFile.pathType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_version.build" Type="Int">19</Property>
<Property Name="Bld_version.build" Type="Int">21</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">CSPP_ISEG.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/CSPP_ISEG/CSPP_ISEG.exe</Property>
......
No preview for this file type
Subproject commit d6222c796bcf878bf6ed9c3255d626bf4105628b
Subproject commit b1080378949f9b3d7ec16050e293dc6b2433e6dc
Subproject commit 3b57f3477d6882cf19c3bfd1277f06ade3b8a684
Subproject commit f87a5c0e7c28978f70569894034ddd1feaee99a8
Subproject commit e1a209a2dcebb164898a7262949e90373c595395
Subproject commit f53b0404d4993be7b89a7ba1027e37aed318a561
Subproject commit a01ffd2894423eeee188104db28817df9b00559e
Subproject commit f589b26c0f4d17fe8222e19bb17c3a619cc50e89
Subproject commit 1c9d6bfaa0c04bad10e96dfe2590ac2693ed42be
Subproject commit 8ec90e6b03eab82b9ff35c7625248998c9be8a07
Subproject commit 76ec82ca8c2df9b445ab48a8dce0b59e6db01b4a
Subproject commit 18c79f1b3ad114ad91ade5141126aadb0447d8cd
......@@ -71,7 +71,7 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myGSI-HVSwitch2Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_BaseActor:CSPP_BaseActor.AllURLsOptional=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="COM8"
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="visa://decpc014.gsi.de/COM8"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=False
CSPP_DeviceActor:CSPP_DeviceActor.OptionString="Simulate=0,RangeCheck=1,QueryInstrStatus=0,Cache=1"
......@@ -89,63 +89,63 @@ Error="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Error"
NumberOfChannels="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_NumberOfChannels"
#For all Channels:
#Channel_0:
Measure_Voltage_0="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_0"
OutputEnable_0="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_0"
Get_Voltage_0="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_0"
Get_OnOff_0="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_0"
Set_Voltage_0L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0L"
Set_Voltage_0H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0H"
#Channel_1:
Measure_Voltage_1="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_1"
OutputEnable_1="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_1"
Get_Voltage_1="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_1"
Get_OnOff_1="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_1"
Set_Voltage_1L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_1L"
Set_Voltage_1H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_1H"
#Channel_2:
Measure_Voltage_2="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_2"
OutputEnable_2="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_2"
Get_Voltage_2="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_2"
Get_OnOff_2="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_2"
Set_Voltage_2L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_2L"
Set_Voltage_2H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_2H"
#Channel_3:
Measure_Voltage_3="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_3"
OutputEnable_3="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_3"
Get_Voltage_3="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_3"
Get_OnOff_3="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_3"
Set_Voltage_3L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_3L"
Set_Voltage_3H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_3H"
#Channel_4:
Measure_Voltage_4="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_4"
OutputEnable_4="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_4"
Get_Voltage_4="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_4"
Get_OnOff_4="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_4"
Set_Voltage_4L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_4L"
Set_Voltage_4H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_4H"
#Channel_5:
Measure_Voltage_5="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_5"
OutputEnable_5="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_5"
Get_Voltage_5="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_5"
Get_OnOff_5="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_5"
Set_Voltage_5L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_5L"
Set_Voltage_5H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_5H"
#Channel_6:
Measure_Voltage_6="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_6"
OutputEnable_6="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_6"
Get_Voltage_6="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_6"
Get_OnOff_6="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_6"
Set_Voltage_6L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_6L"
Set_Voltage_6H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_6H"
#Channel_7:
Measure_Voltage_7="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_7"
OutputEnable_7="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_7"
Get_Voltage_7="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_7"
Get_OnOff_7="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_7"
Set_Voltage_7L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_7L"
Set_Voltage_7H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_7H"
#Channel_8:
Measure_Voltage_8="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_8"
OutputEnable_8="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_8"
Get_Voltage_8="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_8"
Get_OnOff_8="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_8"
Set_Voltage_8L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_8L"
Set_Voltage_8H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_8H"
#Channel_9:
Measure_Voltage_9="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_9"
OutputEnable_9="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_9"
Get_Voltage_9="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_9"
Get_OnOff_9="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_9"
Set_Voltage_9L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_9L"
Set_Voltage_9H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_9H"
#Channel_10:
Measure_Voltage_10="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_10"
OutputEnable_10="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_10"
Get_Voltage_10="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_10"
Get_OnOff_10="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_10"
Set_Voltage_10L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_10L"
Set_Voltage_10H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_10H"
#Channel_11:
Measure_Voltage_11="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_11"
OutputEnable_11="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_11"
Get_Voltage_11="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_11"
Get_OnOff_11="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_11"
Set_Voltage_11L="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_11L"
Set_Voltage_11H="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_11H"
[myGSI-HVSwitch2.URLs]
......@@ -156,63 +156,63 @@ Error="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Error"
NumberOfChannels="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_NumberOfChannels"
#For all Channels:
#Channel_0:
Measure_Voltage_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_0"
OutputEnable_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_0"
Get_Voltage_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_0"
Get_OnOff_0="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_0"
Set_Voltage_0L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0L"
Set_Voltage_0H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_0H"
#Channel_1:
Measure_Voltage_1="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_1"
OutputEnable_1="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_1"
Get_Voltage_1="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_1"
Get_OnOff_1="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_1"
Set_Voltage_1L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_1L"
Set_Voltage_1H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_1H"
#Channel_2:
Measure_Voltage_2="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_2"
OutputEnable_2="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_2"
Get_Voltage_2="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_2"
Get_OnOff_2="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_2"
Set_Voltage_2L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_2L"
Set_Voltage_2H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_2H"
#Channel_3:
Measure_Voltage_3="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_3"
OutputEnable_3="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_3"
Get_Voltage_3="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_3"
Get_OnOff_3="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_3"
Set_Voltage_3L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_3L"
Set_Voltage_3H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_3H"
#Channel_4:
Measure_Voltage_4="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_4"
OutputEnable_4="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_4"
Get_Voltage_4="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_4"
Get_OnOff_4="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_4"
Set_Voltage_4L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_4L"
Set_Voltage_4H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_4H"
#Channel_5:
Measure_Voltage_5="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_5"
OutputEnable_5="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_5"
Get_Voltage_5="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_5"
Get_OnOff_5="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_5"
Set_Voltage_5L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_5L"
Set_Voltage_5H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_5H"
#Channel_6:
Measure_Voltage_6="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_6"
OutputEnable_6="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_6"
Get_Voltage_6="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_6"
Get_OnOff_6="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_6"
Set_Voltage_6L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_6L"
Set_Voltage_6H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_6H"
#Channel_7:
Measure_Voltage_7="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_7"
OutputEnable_7="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_7"
Get_Voltage_7="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_7"
Get_OnOff_7="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_7"
Set_Voltage_7L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_7L"
Set_Voltage_7H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_7H"
#Channel_8:
Measure_Voltage_8="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_8"
OutputEnable_8="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_8"
Get_Voltage_8="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_8"
Get_OnOff_8="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_8"
Set_Voltage_8L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_8L"
Set_Voltage_8H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_8H"
#Channel_9:
Measure_Voltage_9="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_9"
OutputEnable_9="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_9"
Get_Voltage_9="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_9"
Get_OnOff_9="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_9"
Set_Voltage_9L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_9L"
Set_Voltage_9H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_9H"
#Channel_10:
Measure_Voltage_10="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_10"
OutputEnable_10="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_10"
Get_Voltage_10="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_10"
Get_OnOff_10="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_10"
Set_Voltage_10L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_10L"
Set_Voltage_10H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_10H"
#Channel_11:
Measure_Voltage_11="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Measure_Voltage_11"
OutputEnable_11="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_OutputEnable_11"
Get_Voltage_11="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_Voltage_11"
Get_OnOff_11="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Get_OnOff_11"
Set_Voltage_11L="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_11L"
Set_Voltage_11H="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2_Set_Voltage_11H"
[myGSI-HVSwitch2Proxy]
......@@ -221,8 +221,13 @@ CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_ListGui.lvlib:CSPP_ListGui.lvclas
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myGSI-HVSwitch2"
#CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[myGSI-HVSwitch2Proxy.SV-URLs]
Activate="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_WorkerActor?.1"
Settings_Msg="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_Settings_Msg?.1"
Set_Voltage_Msg="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_Set_Voltage_Msg?.1"
Set_OnOff_Msg="ni.var.psp://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_Set_OnOff_Msg?.1"
[myGSI-HVSwitch2Proxy.URLs]
Activate="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_Activate?.1"
WorkerActor="lvmsg://localhost/myGSI-HVSwitch2/myGSI-HVSwitch2Proxy_WorkerActor?.1"
......
......@@ -156,10 +156,10 @@ Set_Voltage_TR6QD54="ni.var.psp://DLPC105/ISEG/OPC/can0/ma41/ch06/VSet"
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
#CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DCPwrGui.lvlib:CSPP_DCPwrGui.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_ListGui.lvlib:CSPP_ListGui.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myISEG"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[myISEGProxy.URLs]
Activate="ni.var.psp://localhost/myProcess/myISEGProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/myProcess/myISEGProxy_WorkerActor?.1"
......@@ -224,7 +224,6 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myPSConnect"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
#CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[myPSConnectProxy.URLs]
Activate="ni.var.psp://localhost/CSPP_PowerSupply_SV/myPSConnectProxy_Activate?.Horizontal"
WorkerActor="ni.var.psp://localhost/CSPP_PowerSupply_SV/myPSConnectProxy_WorkerActor?.Horizontal"
......
Subproject commit 0b4e140f2f9d4d93d2425ecfda99eee889e320e0
Subproject commit 9e4b82df3bc4542d5fa545ee4f2edf88ef94cdc6
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