Commit 4d4ca607 authored by Holger Brand's avatar Holger Brand
Browse files

Add upgraded LS218 submodule.

parent 70c1b3f7
......@@ -13,3 +13,6 @@
[submodule "Packages/BNT_DAQmx"]
path = Packages/BNT_DAQmx
url = https://github.com/HB-BNT/BNT_DAQmx.git
[submodule "Packages/LS218"]
path = Packages/LS218
url = https://git.gsi.de/EE-LV/CSPP/STF/LS218.git
Subproject commit cd1855f8eaf76f9831f031b944cb2e7880806a15
......@@ -136,6 +136,7 @@ SystemMonitor=False
#BaseActorGUI=False
#DeviceActor=False
#DeviceActorGUI=False
#LS218=False
Valve=False
[StartActor.ActorList]
List of Actor objects to be started manually, with option to relaunch.
......@@ -149,7 +150,10 @@ DSCManager=False
DSCTrendViewer=False
ObjectManager=False
SystemMonitor=False
LS218=False
LS218GUI=False
Valve=False
ValveGUI=False
[StartActor.URLs]
ActorList="ni.var.psp://localhost/S2GT/ActorList?.1"
[Beep]
......@@ -285,9 +289,7 @@ CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceG
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.PVProxy="ValveProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
BNT_DAQmx:BNT_DAQmx-MCSV.DO-Lines="port0/line0:6"
[Valve.URLs]
PollingCounter="ni.var.psp://localhost/S2GT/Valve_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/S2GT/Valve_PollingDeltaT?.1"
......@@ -329,4 +331,77 @@ Selftest_Device_Msg="ni.var.psp://localhost/S2GT/Valve_SelfTest"
Set_Output_Line_Msg="ni.var.psp://localhost/S2GT/Valve_Set-DO_0,ni.var.psp://localhost/S2GT/Valve_Set-DO_1,ni.var.psp://localhost/S2GT/Valve_Set-DO_2,ni.var.psp://localhost/S2GT/Valve_Set-DO_3,ni.var.psp://localhost/S2GT/Valve_Set-DO_4,ni.var.psp://localhost/S2GT/Valve_Set-DO_5,ni.var.psp://localhost/S2GT/Valve_Set-DO_6"
#Set_Output_Lines_Msg="ni.var.psp://localhost/S2GT/Valve_Set-DOsA"
Set_Output_Lines_Msg="ni.var.psp://localhost/S2GT/Valve_Set-DO"
[ValveGUI]
LVClassPath="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_GUIActor:CSPP_GUIActor.AssociatedActor="Valve"
CSPP_GUIActor:CSPP_GUIActor.AssociatedPVProxy="ValveProxy"
CSPP_GUIActor:CSPP_GUIActor.StopAssociatedActor=False
[LS218]
LVClassPath="LS218.lvlib:LS218.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.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="LS218Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="GPIB0::5::INSTR"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
LS218:LS218.SensorCalibration="C:\...\LS218-Calibration.ini"
[LS218.URLs]
Error="ni.var.psp://localhost/LS218-SV/LS218_Error?.1"
ErrorCode="ni.var.psp://localhost/LS218-SV/LS218_ErrorCode?.1"
ErrorMessage="ni.var.psp://localhost/LS218-SV/LS218_ErrorMessage|1024?.1"
ErrorStatus="ni.var.psp://localhost/LS218-SV/LS218_ErrorStatus?.1"
PollingCounter="ni.var.psp://localhost/LS218-SV/LS218_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/LS218-SV/LS218_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/LS218-SV/LS218_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/LS218-SV/LS218_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/LS218-SV/LS218_PollingMode?.1"
PollingTime="ni.var.psp://localhost/LS218-SV/LS218_PollingTime?.1"
ResourceName="ni.var.psp://localhost/LS218-SV/LS218_ResourceName?.1"
DriverRevision="ni.var.psp://localhost/LS218-SV/LS218_DriverRevision?.1"
FirmwareRevision="ni.var.psp://localhost/LS218-SV/LS218_FirmwareRevision?.1"
SelftestResultCode="ni.var.psp://localhost/LS218-SV/LS218_SelftestResultCode?.1"
SelftestResultMessage="ni.var.psp://localhost/LS218-SV/LS218_SelftestResultMessage|1024?.1"
T0="ni.var.psp://localhost/LS218-SV/LS218_T0"
T1="ni.var.psp://localhost/LS218-SV/LS218_T1"
Relay="ni.var.psp://localhost/LS218-SV/LS218_Relay"
S0="ni.var.psp://localhost/LS218-SV/LS218_S0"
S1="ni.var.psp://localhost/LS218-SV/LS218_S1"
SN0="ni.var.psp://localhost/LS218-SV/LS218_SN0"
SN1="ni.var.psp://localhost/LS218-SV/LS218_SN1"
[LS218Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="LS218"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[LS218Proxy.URLs]
Activate="ni.var.psp://localhost/LS218-SV/LS218Proxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/LS218-SV/LS218Proxy_WorkerActor|1024?.1"
Polling_Interval_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/LS218-SV/LS218_Reset?.1"
Selftest_Device_Msg="ni.var.psp://localhost/LS218-SV/LS218_SelfTest?.1"
Configure_Alarms_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-ConfigureAlarms"
Configure_Relays_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-ConfigureRelays"
Log_Data_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-LogData"
Reset_Alarms_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-ResetAlarms"
Reset_Min-Max_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-ResetMinMax"
Write_Single_Calibration_Curve_to_Instrument_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-SingleCalibrationCurvetoInstrument"
Write_calibration_curves_to_instruments_Msg="ni.var.psp://localhost/LS218-SV/LS218_Set-CalibrationCurvestoInstruments"
[LS218GUI]
LVClassPath="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_GUIActor:CSPP_GUIActor.AssociatedActor="LS218"
CSPP_GUIActor:CSPP_GUIActor.AssociatedPVProxy="LS218Proxy"
CSPP_GUIActor:CSPP_GUIActor.StopAssociatedActor=False
This diff is collapsed.
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