Commit 70c1b3f7 authored by Holger Brand's avatar Holger Brand
Browse files

Add BNT_DAQmx submodule, Add Valve actor to ini-file;Add VI with frontpanel...

Add BNT_DAQmx submodule, Add Valve actor to ini-file;Add VI with frontpanel binding for valve operation.
parent ce1e66cd
......@@ -10,3 +10,6 @@
[submodule "Packages/CSPP_DSC"]
path = Packages/CSPP_DSC
url = https://git.gsi.de/EE-LV/CSPP/CSPP_DSC
[submodule "Packages/BNT_DAQmx"]
path = Packages/BNT_DAQmx
url = https://github.com/HB-BNT/BNT_DAQmx.git
Subproject commit a6773fc9937cfbae8a2d31761063dc1732438e95
......@@ -5,8 +5,8 @@ WebServer.TcpAccess="c+*.gsi.de"
# Class attributes are specified as follows. All values are parsed as strings.
# LibraryName:ClassName.AttributeName=""
[PV_Protocols]
#ni.var.psp=DSCConnection
ni.var.psp=SVConnection
ni.var.psp=DSCConnection
#ni.var.psp=SVConnection
#dstp=DSConnection
[DSCConnection]
LVClassPath="CSPP_DSCConnection.lvlib:DSCConnection.lvclass"
......@@ -16,10 +16,10 @@ LVClassPath="CSPP_ProcessVariables.lvlib:DSConnection.lvclass"
LVClassPath="CSPP_SharedVariables.lvlib:SVConnection.lvclass"
#_p:Polling; _e:Events
[PV_Monitors]
#ni.var.psp_p=DSCMonitor
#ni.var.psp_e=DSCMonitor
ni.var.psp_p=SVMonitor
ni.var.psp_e=SVMonitor
ni.var.psp_p=DSCMonitor
ni.var.psp_e=DSCMonitor
#ni.var.psp_p=SVMonitor
#ni.var.psp_e=SVMonitor
#dstp_p=DSMonitor
#dstp_e=DSMonitor
[DSCMonitor]
......@@ -134,10 +134,9 @@ ObjectManager=False
SystemMonitor=False
#BaseActor=False
#BaseActorGUI=False
#BaseActorProxy=False
#DeviceActor=False
#DeviceActorGUI=False
#DeviceActorProxy=False
Valve=False
[StartActor.ActorList]
List of Actor objects to be started manually, with option to relaunch.
Beep=True
......@@ -150,8 +149,9 @@ DSCManager=False
DSCTrendViewer=False
ObjectManager=False
SystemMonitor=False
Valve=False
[StartActor.URLs]
ActorList="ni.var.psp://localhost/CSPP-Template/ActorList?.1"
ActorList="ni.var.psp://localhost/S2GT/ActorList?.1"
[Beep]
LVClassPath="CSPP_BeepActor.lvlib:Beep.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......@@ -187,7 +187,8 @@ Write_Beep_Parameters_Msg="ni.var.psp://localhost/CSPP_Utilities_SV/Beep_Paramet
[DSCAlarmViewer]
LVClassPath="CSPP_DSCAlarmViewer.lvlib:CSPP_DSCAlarmViewer.lvclass"
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_0 = "\\\\localhost\\CSPP-Template"
CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_0 = "\\\\localhost\\S2GT"
CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_1 = "\\\\localhost\\CSPP_SystemMonitor_SV"
[DSCTrendViewer]
LVClassPath="CSPP_DSCTrendViewer.lvlib:CSPP_DSCTrendViewer.lvclass"
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
......@@ -195,7 +196,7 @@ CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
CSPP_DSCTrendViewer:CSPP_DSCTrendViewer.Configuration_File=""
[DSClog]
LVClassPath="CSPP_DSCMsgLogger.lvlib:CSPP_DSCMsgLogger.lvclass"
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Process="CSPP-Template"
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Process="S2GT"
#Alarm or Event
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Error="Alarm"
[DSCManager]
......@@ -210,12 +211,12 @@ CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_ObjectManager:CSPP_ObjectManager.ActorList="StartActor.ActorList"
[ObjectManager.URLs]
#PollingCounter="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingCounter?.1"
#PollingDeltaT="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingDeltaT"
#PollingInterval="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingInterval"
#PollingIterations="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingIterations"
#PollingMode="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingMode"
#PollingTime="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingTime"
#PollingCounter="ni.var.psp://localhost/S2GT/ObjectManager_PollingCounter?.1"
#PollingDeltaT="ni.var.psp://localhost/S2GT/ObjectManager_PollingDeltaT"
#PollingInterval="ni.var.psp://localhost/S2GT/ObjectManager_PollingInterval"
#PollingIterations="ni.var.psp://localhost/S2GT/ObjectManager_PollingIterations"
#PollingMode="ni.var.psp://localhost/S2GT/ObjectManager_PollingMode"
#PollingTime="ni.var.psp://localhost/S2GT/ObjectManager_PollingTime"
[ObjectManagerProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -224,12 +225,12 @@ CSPP_PVProxy:CSPP_PVProxy.WorkerActor="ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
CSPP_PVProxy:CSPP_PVProxy.IgnoreFirstUpdate=False
[ObjectManagerProxy.URLs]
Activate="ni.var.psp://localhost/CSPP-Template/ObjectManagerProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP-Template/ObjectManagerProxy_WorkerActor?.1"
#Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingInterval"
#Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingIterations"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingStartStop"
Update_Process_Info_Msg="ni.var.psp://localhost/CSPP-Template/ActorList"
Activate="ni.var.psp://localhost/S2GT/ObjectManagerProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/S2GT/ObjectManagerProxy_WorkerActor?.1"
#Polling_Interval_Msg="ni.var.psp://localhost/S2GT/ObjectManager_Set-PollingInterval"
#Polling_Iterations_Msg="ni.var.psp://localhost/S2GT/ObjectManager_Set-PollingIterations"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/S2GT/ObjectManager_Set-PollingStartStop"
Update_Process_Info_Msg="ni.var.psp://localhost/S2GT/ActorList"
[SystemMonitor]
LVClassPath="CSPP_SystemMonitor.lvlib:CSPP_SystemMonitor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......@@ -266,3 +267,66 @@ WorkerActor="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitorProxy_Wor
Polling_Interval_Msg="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitor_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitor_Set-PollingStartStop"
[Valve]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-TC.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-RTD.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-Ctr2Freq.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-DOPWM.lvclass"
#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot4"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
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"
PollingInterval="ni.var.psp://localhost/S2GT/Valve_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/S2GT/Valve_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/S2GT/Valve_PollingMode"
PollingTime="ni.var.psp://localhost/S2GT/Valve_PollingTime"
ResourceName="ni.var.psp://localhost/S2GT/Valve_ResourceName"
DriverRevision="ni.var.psp://localhost/S2GT/Valve_DriverRevision"
FirmwareRevision="ni.var.psp://localhost/S2GT/Valve_FirmwareRevision"
SelftestResultCode="ni.var.psp://localhost/S2GT/Valve_SelftestResultCode"
SelftestResultMessage="ni.var.psp://localhost/S2GT/Valve_SelftestResultMessage"
Error="ni.var.psp://localhost/S2GT/Valve_Error"
ErrorStatus="ni.var.psp://localhost/S2GT/Valve_ErrorStatus"
ErrorCode="ni.var.psp://localhost/S2GT/Valve_ErrorCode"
ErrorMessage="ni.var.psp://localhost/S2GT/Valve_ErrorMessage"
DO="ni.var.psp://localhost/S2GT/Valve_DO"
DO0="ni.var.psp://localhost/S2GT/Valve_DO_0"
DO1="ni.var.psp://localhost/S2GT/Valve_DO_1"
DO2="ni.var.psp://localhost/S2GT/Valve_DO_2"
DO3="ni.var.psp://localhost/S2GT/Valve_DO_3"
DO4="ni.var.psp://localhost/S2GT/Valve_DO_4"
DO5="ni.var.psp://localhost/S2GT/Valve_DO_5"
DO6="ni.var.psp://localhost/S2GT/Valve_DO_6"
[ValveProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="Valve"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[ValveProxy.URLs]
Polling_Interval_Msg="ni.var.psp://localhost/S2GT/Valve_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/S2GT/Valve_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/S2GT/Valve_Set-PollingStartStop?.1"
WorkerActor="ni.var.psp://localhost/S2GT/ValveProxy_WorkerActor"
Activate="ni.var.psp://localhost/S2GT/ValveProxy_Activate"
Reset_Device_Msg="ni.var.psp://localhost/S2GT/Valve_Reset"
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"
This diff is collapsed.
No preview for this file type
This diff is collapsed.
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