Commit 062ce5aa authored by Dennis Neidherr's avatar Dennis Neidherr 😲

ein paar Updates

parent 22425922
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="19008000">
<Property Name="CCSymbols" Type="Str">CSPP_BuildSpec,CSPP_PPG;CSPP_WithDIM,False;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,False;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,False;PPG_WithSubCycle,False;CSPP_BuildContent,CSPP_Core;CSPP_WebpubLaunchBrowser,None;</Property>
<Property Name="CCSymbols" Type="Str">CSPP_BuildSpec,ST_CGC;CSPP_WithDIM,False;CSPP_WithDIM,False;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,True;CSPP_WithDIM,False;PPG_WithSubCycle,False;CSPP_BuildContent,CSPP_Core;CSPP_WebpubLaunchBrowser,None;</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="NI.Project.Description" Type="Str">This LabVIEW project "CS++.lvproj" is used to develop the successor of the CS Framework.
......@@ -378,12 +378,12 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="IOScan.StartEngineOnDeploy" Type="Bool">false</Property>
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.tcp.acl" Type="Str">0800000008000000</Property>
<Property Name="server.tcp.enabled" Type="Bool">false</Property>
<Property Name="server.tcp.acl" Type="Str">620000000A000000020000002B000000030000000F00000073687070633030352E6773692E6465100000000300000000000100000000002B000000030000000F0000006B703270633233352E6773692E646510000000030000000000010000000000</Property>
<Property Name="server.tcp.enabled" Type="Bool">true</Property>
<Property Name="server.tcp.port" Type="Int">3363</Property>
<Property Name="server.tcp.serviceName" Type="Str"></Property>
<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
<Property Name="server.vi.access" Type="Str"></Property>
<Property Name="server.vi.access" Type="Str">+*.*</Property>
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.viscripting.showScriptingOperationsInContextHelp" Type="Bool">false</Property>
......@@ -1696,7 +1696,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">108</Property>
<Property Name="Bld_version.build" Type="Int">110</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">CSPP_TDC8HP.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/CSPP_TDC8HP/CSPP_TDC8HP.exe</Property>
......@@ -2157,7 +2157,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">76</Property>
<Property Name="Bld_version.build" Type="Int">77</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">ST_CGC.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/ST_CGC/ST_CGC.exe</Property>
......@@ -2266,7 +2266,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">134</Property>
<Property Name="Bld_version.build" Type="Int">137</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">ST_Main.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/ST_Main/ST_Main.exe</Property>
......@@ -2279,7 +2279,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/CSPP.ico</Property>
<Property Name="Exe_VardepHideDeployDlg" Type="Bool">true</Property>
<Property Name="Exe_VardepUndeployOnExit" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{D36CA4B8-AE1E-4714-89B7-28A67417E820}</Property>
<Property Name="Source[0].itemID" Type="Str">{A58E2710-94E5-4890-AAB3-63D5FD78DB3D}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/CSPP_Main.vi</Property>
......
Subproject commit 3fe712d706f9d7bf8eabe9c27900a7bbe7b7c4c9
Subproject commit 61880b6587dde034d9d0040adf74da85d3a4c12f
......@@ -78,6 +78,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName=""
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStart_ns=-20
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStop_ns=50
CSPP_TDC8HP:CSPP_TDC8HP.PublishInterval_s=0.1
CSPP_TDC8HP:CSPP_TDC8HP.SimulationMode=False
CSPP_TDC8HP:CSPP_TDC8HP.ForceSynch=True
CSPP_TDC8HP:CSPP_TDC8HP.ReadDataWait_ms=10
......
This diff is collapsed.
......@@ -453,16 +453,16 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PVProxy="IonSourcesProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_BaseActor:CSPP_BaseActor.AllURLsOptional=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="//localhost/CaenOPCClient/OPC/SY1527/"
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="//localhost/CaenOPCClient/OPC/"
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"
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.PVURLPrefix="ni.var.psp://localhost/CaenOPCClient/OPC/SY1527/"
CSPP_DeviceActor:CSPP_DeviceActor.PVURLPrefix="ni.var.psp://localhost/CaenOPCClient/OPC/"
CSPP_DeviceActor:CSPP_DeviceActor.PVURLSuffixes="IMon,VMon,Pw,I0Set,V0Set,RUp,RDWn"
CSPP_DeviceActor:CSPP_DeviceActor.PVPrefixes="Get_Current,Get_Voltage,Get_OnOff,Set_Current,Set_Voltage,RampUpVoltage,RampDownVoltage"
CSPP_DCPwr:CSPP_DCPwr.ChannelNames="Cs IonEnergy,Cs Extraction,Cs Lens Right,BuncherIS Energy,ClusterIS Lens,ClusterIS DefRight,MRFQ Rod Offset,MRFQ E2,MRFQ E3,MRFQ E4 Up,MRFQ E4 Down,MRFQ E4 Left,MRFQ E4 Right,MRFQ E5,MRFQ E6/Lens6/Lens8,MRFQ QuadDef 1,MRFQ QuadDef 2,MRFQ QuadDef Body,MRFQ Lens 1,MRFQ Lens 2/4,MRFQ Lens 3,MRFQ Lens 5 Up,MRFQ Lens 5 Down,MRFQ Lens 7,Spare 1,Spare 2"
CSPP_ListGui:CSPP_ListGui.TypeClassPath="CSPP_ListGui.lvlib:CSPP_HVChannelData.lvclass"
#CSPP_DCPwr:CSPP_DCPwr.ChannelNames="Cs IonEnergy,Cs Extraction,Cs Lens Right,BuncherIS Energy,ClusterIS Lens,ClusterIS DefRight,MRFQ Rod Offset,MRFQ E2,MRFQ E3,MRFQ E4 Up,MRFQ E4 Down,MRFQ E4 Left,MRFQ E4 Right,MRFQ E5,MRFQ E6/Lens6/Lens8,MRFQ QuadDef 1,MRFQ QuadDef 2,MRFQ QuadDef Body,MRFQ Lens 1,MRFQ Lens 2/4,MRFQ Lens 3,MRFQ Lens 5 Up,MRFQ Lens 5 Down,MRFQ Lens 7,Spare 1,Spare 2"
CSPP_DCPwr:CSPP_DCPwr.ChannelNames="MRFQ Rod Offset,MRFQ E2,MRFQ E3,MRFQ E4 Up,MRFQ E4 Down,MRFQ E4 Left,MRFQ E4 Right,MRFQ E5,MRFQ E6,IS Plate 1,IS Lens 1 Right Down,IS Lens 1 Left Up,IS Lens 2 4,IS Lens 3,IS QuadDef 1,IS QuadDef 2,IS QuadDef Body,IS Lens 5 Up,IS Lens 5 Down,IS Lens 5 Left,IS Lens 5 Right,IS Lens 6 8,IS Lens 7,IS Lens 9 Right Down,IS Lens 9 Left Up,IS Lens 10 12,IS Lens 11" CSPP_ListGui:CSPP_ListGui.TypeClassPath="CSPP_ListGui.lvlib:CSPP_HVChannelData.lvclass"
CSPP_ListGui:CSPP_ListGui.ShowFileMenu=True
CSPP_ListGui:CSPP_ListGui.UpdateRate=500
[IonSources.URLs]
......@@ -476,33 +476,33 @@ ErrorCode="ni.var.psp://localhost/ST_CAEN/IonSources_ErrorCode"
ErrorMessage="ni.var.psp://localhost/ST_CAEN/IonSources_ErrorMessage"
NumberOfChannels="ni.var.psp://localhost/ST_CAEN/IonSources_NumberOfChannels"
DriverRevisionHW="ni.var.psp://localhost/CaenOPCClient/OPC/SY1527/SwRelease"
FirmwareRevisionHW="ni.var.psp://localhost/CaenOPCClient/OPC/SY1527/Board07/Fmw Release"
Cs IonEnergy="/Board04/Chan008/"
Cs Extraction="/Board00/Chan011/"
Cs Lens Right="/Board04/Chan009/"
BuncherIS Energy="/Board04/Chan007/"
ClusterIS Lens="/Board06/Chan011/"
ClusterIS DefRight="/Board14/Chan002/"
MRFQ Rod Offset="/Board06/Chan002/"
MRFQ E2="/Board15/Chan011/"
MRFQ E3="/Board15/Chan010/"
MRFQ E4 Up="/Board15/Chan007/"
MRFQ E4 Down="/Board15/Chan009/"
MRFQ E4 Left="/Board13/Chan001/"
MRFQ E4 Right="/Board12/Chan000/"
MRFQ E5="/Board13/Chan000/"
MRFQ E6/Lens6/Lens8="/Board11/Chan009/"
MRFQ QuadDef 1="/Board11/Chan000/"
MRFQ QuadDef 2="/Board06/Chan009/"
MRFQ QuadDef Body="/Board14/Chan000/"
MRFQ Lens 1="/Board06/Chan008/"
MRFQ Lens 2/4="/Board06/Chan010/"
MRFQ Lens 3="/Board12/Chan010/"
MRFQ Lens 5 Up="/Board12/Chan003/"
MRFQ Lens 5 Down="/Board12/Chan011/"
MRFQ Lens 7="/Board11/Chan011/"
Spare 1="/Board12/Chan001/"
Spare 2="/Board15/Chan008/"
FirmwareRevisionHW="ni.var.psp://localhost/CaenOPCClient/OPC/SY1527/Board07/Fmw Release"MRFQ Rod Offset="/SY4527/Board14/Chan000/" MRFQ E2="/SY4527/Board08/Chan000/" MRFQ E3="/SY4527/Board08/Chan001/" MRFQ E4 Up="/SY4527/Board08/Chan002/" MRFQ E4 Down="/SY4527/Board08/Chan003/" MRFQ E4 Left="/SY4527/Board08/Chan004/" MRFQ E4 Right="/SY4527/Board08/Chan005/" MRFQ E5="/SY4527/Board08/Chan006/" MRFQ E6="/SY4527/Board08/Chan007/" IS Plate 1="/SY4527/Board14/Chan002/" IS Lens 1 Right Down="/SY4527/Board08/Chan008/" IS Lens 1 Left Up="/SY4527/Board08/Chan009/" IS Lens 2 4="/SY4527/Board08/Chan010/" IS Lens 3="/SY4527/Board08/Chan011/" IS QuadDef 1="/SY4527/Board08/Chan012/" IS QuadDef 2="/SY4527/Board08/Chan013/" IS QuadDef Body="/SY4527/Board08/Chan014/" IS Lens 5 Up="/SY4527/Board08/Chan015/" IS Lens 5 Down="/SY4527/Board08/Chan016/" IS Lens 5 Left="/SY4527/Board08/Chan017/" IS Lens 5 Right="/SY4527/Board08/Chan018/" IS Lens 6 8="/SY4527/Board08/Chan019/" IS Lens 7="/SY4527/Board08/Chan020/" IS Lens 9 Right Down="/SY4527/Board08/Chan021/" IS Lens 9 Left Up="/SY4527/Board08/Chan022/" IS Lens 10 12="/SY4527/Board08/Chan023/" IS Lens 11="/SY4527/Board12/Chan000/"
#Cs IonEnergy="/Board04/Chan008/"
#Cs Extraction="/Board00/Chan011/"
#Cs Lens Right="/Board04/Chan009/"
#BuncherIS Energy="/Board04/Chan007/"
#ClusterIS Lens="/Board06/Chan011/"
#ClusterIS DefRight="/Board14/Chan002/"
#MRFQ Rod Offset="/Board06/Chan002/"
#MRFQ E2="/Board15/Chan011/"
#MRFQ E3="/Board15/Chan010/"
#MRFQ E4 Up="/Board15/Chan007/"
#MRFQ E4 Down="/Board15/Chan009/"
#MRFQ E4 Left="/Board13/Chan001/"
#MRFQ E4 Right="/Board12/Chan000/"
#MRFQ E5="/Board13/Chan000/"
#MRFQ E6/Lens6/Lens8="/Board11/Chan009/"
#MRFQ QuadDef 1="/Board11/Chan000/"
#MRFQ QuadDef 2="/Board06/Chan009/"
#MRFQ QuadDef Body="/Board14/Chan000/"
#MRFQ Lens 1="/Board06/Chan008/"
#MRFQ Lens 2/4="/Board06/Chan010/"
#MRFQ Lens 3="/Board12/Chan010/"
#MRFQ Lens 5 Up="/Board12/Chan003/"
#MRFQ Lens 5 Down="/Board12/Chan011/"
#MRFQ Lens 7="/Board11/Chan011/"
#Spare 1="/Board12/Chan001/"
#Spare 2="/Board15/Chan008/"
[IonSourcesProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_ListGui.lvlib:CSPP_ListGui.lvclass"
......
Subproject commit dab6c50592a0850b88d510781bcd95cd7a62f717
Subproject commit 03b264338916a80e62544d571ebff2a721135258
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