Commit 295e7cf3 authored by Holger Brand's avatar Holger Brand
Browse files

Update submnodules; Add CSPP_PR4000GUI.

parent 2a4a6454
Subproject commit 28d5298138b6891ae7f9cf4312ec4766c25bde5a
Subproject commit 3264ea264a2fab7746be5f63a8364145b5ac7d81
Subproject commit 73f47cec7bb377012f81281b278ab56e8d055b23
Subproject commit b693099a47b6001b8c737d7d62ab5af5517f29e3
......@@ -408,7 +408,7 @@ CSPP_GUIActor:CSPP_GUIActor.StopAssociatedActor=False
LVClassPath="CSPP_PR4000.lvlib:CSPP_PR4000.lvclass"
CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
# Settings: "Ignore", "Auto", "User"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_PR4000GUI.lvlib:CSPP_PR4000GUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
......@@ -419,8 +419,8 @@ CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=False
CSPP_PR4000:CSPP_PR4000.Baudrate="9600,Odd,8,1,None"
CSPP_PR4000:CSPP_PR4000.Address=-1
CSPP_PR4000:CSPP_PR4000.NofChannels=2
CSPP_PR4000:CSPP_PR4000.Resolution=False #False:Standard, True:16Bit
CSPP_PR4000:CSPP_PR4000.NofChannels=2
[PR4000.URLs]
Error="ni.var.psp://localhost/S2GT/PR4000_Error?.1"
ErrorCode="ni.var.psp://localhost/S2GT/PR4000_ErrorCode?.1"
......@@ -437,10 +437,12 @@ DriverRevision="ni.var.psp://localhost/S2GT/PR4000_DriverRevision?.1"
FirmwareRevision="ni.var.psp://localhost/S2GT/PR4000_FirmwareRevision?.1"
SelftestResultCode="ni.var.psp://localhost/S2GT/PR4000_SelftestResultCode?.1"
SelftestResultMessage="ni.var.psp://localhost/S2GT/PR4000_SelftestResultMessage|1024?.1"
NofChannel="ni.var.psp://localhost/S2GT/PR4000_NofChannels"
Resolution="ni.var.psp://localhost/S2GT/PR4000_Resolution"
Status_0="ni.var.psp://localhost/S2GT/PR4000_Status"
Relay_0="ni.var.psp://localhost/S2GT/PR4000_Relay_0"
Valve_0="ni.var.psp://localhost/S2GT/PR4000_Valve_0"
Range_0="ni.var.psp://localhost/S2GT/PR4000_Range_0"
RangeValue_0="ni.var.psp://localhost/S2GT/PR4000_RangeValue_0"
RangeUnit_0="ni.var.psp://localhost/S2GT/PR4000_RangeUnit_0"
Setpoint_0="ni.var.psp://localhost/S2GT/PR4000_Setpoint_0"
......@@ -448,6 +450,7 @@ Value_0="ni.var.psp://localhost/S2GT/PR4000_Value_0"
ExternalInput_0=ni.var.psp://localhost/S2GT/PR4000_ExternalInput_0"
Relay_1="ni.var.psp://localhost/S2GT/PR4000_Relay_1"
Valve_1="ni.var.psp://localhost/S2GT/PR4000_Valve_1"
Range_1="ni.var.psp://localhost/S2GT/PR4000_Range_1"
RangeValue_1="ni.var.psp://localhost/S2GT/PR4000_RangeValue_1"
RangeUnit_1="ni.var.psp://localhost/S2GT/PR4000_RangeUnit_1"
Setpoint_1="ni.var.psp://localhost/S2GT/PR4000_Setpoint_1"
......@@ -455,7 +458,7 @@ Value_1="ni.var.psp://localhost/S2GT/PR4000_Value_1"
ExternalInput_1=ni.var.psp://localhost/S2GT/PR4000_ExternalInput_1"
[PR4000Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_PR4000GUI.lvlib:CSPP_PR4000GUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="PR4000"
......@@ -470,13 +473,13 @@ Reset_Device_Msg="ni.var.psp://localhost/S2GT/PR4000_Reset?.1"
Selftest_Device_Msg="ni.var.psp://localhost/S2GT/PR4000_SelfTest?.1"
Valve_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Valve_0,ni.var.psp://localhost/S2GT/PR4000_Set-Valve_1"
Relay_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Relay_0,ni.var.psp://localhost/S2GT/PR4000_Set-Relay_1"
Relay_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Relay_0,ni.var.psp://localhost/S2GT/PR4000_Set-Relay_1"
Range_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Range_0,ni.var.psp://localhost/S2GT/PR4000_Set-Range_1"
RangeValue_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-RangeValue_0,ni.var.psp://localhost/S2GT/PR4000_Set-RangeValue_1"
RangeUnit_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-RangeUnit_0,ni.var.psp://localhost/S2GT/PR4000_Set-RangeUnit_1"
Resolution_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Resolution"
Setpoint_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-Setpoint_0,ni.var.psp://localhost/S2GT/PR4000_Set-Setpoint_1"
[PR4000GUI]
LVClassPath="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
LVClassPath="CSPP_PR4000GUI.lvlib:CSPP_PR4000GUI.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_GUIActor:CSPP_GUIActor.AssociatedActor="PR4000"
......
......@@ -543,6 +543,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
</Item>
<Item Name="CSPP_Vacuum" Type="Folder">
<Item Name="CSPP_PR4000.lvlib" Type="Library" URL="../Packages/CSPP_Vacuum/CSPP_PR4000/CSPP_PR4000.lvlib"/>
<Item Name="CSPP_PR4000GUI.lvlib" Type="Library" URL="../Packages/CSPP_Vacuum/CSPP_PR4000/CSPP_PR4000GUI.lvlib"/>
<Item Name="CSPP_Vacuum.lvlib" Type="Library" URL="../Packages/CSPP_Vacuum/CSPP_Vacuum.lvlib"/>
</Item>
<Item Name="DSC" Type="Folder">
......
No preview for this file type
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