Commit 864c1245 authored by Holger Brand's avatar Holger Brand
Browse files

Merge branch 'feature/AccRest' into develop

parents 407f9632 e545423f
......@@ -1308,7 +1308,8 @@ CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager"
ActorList="ni.var.psp://localhost/UTCS_AE/ActorList"
[StartActor.StartActors]
ObjectManager=False
[StartActor.StartActorsT]
AccRestSVInterface=False
[#StartActor.StartActors]
#Actor objects to start with option to relaunch.
#First actor in this list, ascending order, is Main-Actor. Stopping this actor triggers stopping the entire application if CSPP_StartActor:CSPP_StartActor.Open_ActorCore=False.
#ObjectManager=False
......@@ -1325,6 +1326,7 @@ PScaler=True
#SystemMonitor=True
[StartActor.ActorList]
#List of Actor object to be started manually, with option to relaunch.
AccRestSVInterface=False
DSCManager=False
DSCTrendViewer=False
Beep=False
......@@ -1559,3 +1561,131 @@ Polling_Interval_Msg="ni.var.psp://localhost/UTCS_AlarmHandler_SV/UTCSAlarmHandl
Polling_Iterations_Msg="ni.var.psp://localhost/UTCS_AlarmHandler_SV/UTCSAlarmHandler_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UTCS_AlarmHandler_SV/UTCSAlarmHandler_Set-PollingStartStop"
Dipole_Current_AE_Enable_Msg="ni.var.psp://localhost/UTCS_AlarmHandler_SV/UTCSAlarmHandler_Enable-DipoleCurrent"
[AccRestConnection]
LVClassPath="CSPP_AccRestConnection.lvlib:CSPP_AccRestConnection.lvclass"
CSPP_AccRestConnection:CSPP_AccRestConnection.URLServerPrefix= "https://restpro00a.acc.gsi.de/japc/client/v1/"
CSPP_AccRestConnection:CSPP_AccRestConnection.VerifyServer= False
CSPP_AccRestConnection:CSPP_AccRestConnection.Token= ""
CSPP_AccRestConnection:CSPP_AccRestConnection.Username= ""
CSPP_AccRestConnection:CSPP_AccRestConnection.Password= ""
CSPP_AccRestConnection:CSPP_AccRestConnection.Timeout= 1. # Unit:s
CSPP_AccRestConnection:CSPP_AccRestConnection.SelectorPrefix= "FAIR.SELECTOR." #Constant
CSPP_AccRestConnection:CSPP_AccRestConnection.SelectorValue= "S=3" #C=<CHAIN_INDEX>:T=<TIMING_GID>:S=<SEQUENCE_INDEX>:P=<PROCESS_INDEX>
[AccRestTestConnection]
LVClassPath="CSPP_AccRestConnection.lvlib:CSPP_AccRestConnection.lvclass"
CSPP_AccRestConnection:CSPP_AccRestConnection.URLServerPrefix= "http://vmla012.acc.gsi.de:8096/"
CSPP_AccRestConnection:CSPP_AccRestConnection.VerifyServer= False
CSPP_AccRestConnection:CSPP_AccRestConnection.Token= "Zi5sYWZyaXRlOmdzaS1mYWlyLWdlaGVpbQ=="
CSPP_AccRestConnection:CSPP_AccRestConnection.Username= ""
CSPP_AccRestConnection:CSPP_AccRestConnection.Password= ""
CSPP_AccRestConnection:CSPP_AccRestConnection.Timeout= 1. # Unit:s
CSPP_AccRestConnection:CSPP_AccRestConnection.SelectorPrefix= "" #Constant
CSPP_AccRestConnection:CSPP_AccRestConnection.SelectorValue= "All" #C=<CHAIN_INDEX>:T=<TIMING_GID>:S=<SEQUENCE_INDEX>:P=<PROCESS_INDEX>
[AccRestSVInterface]
LVClassPath="CSPP_AccRestSVInterface.lvlib:CSPP_AccRestSVInterface.lvclass"
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore" # Settings: "Ignore", "Auto", "User"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PublishMsgsInPQ=False
CSPP_BaseActor:CSPP_BaseActor.PVProxy="AccRestSVInterfaceProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=False
CSPP_AccRestSVInterface:CSPP_AccRestSVInterface.Connection = "AccRestConnection"
CSPP_AccRestSVInterface:CSPP_AccRestSVInterface.IgnoreVirtAccErr = True # Invalid virtual accrelerator will stop the actor!
CSPP_AccRestSVInterface:CSPP_AccRestSVInterface.PV_Sgl = "GUX8DT3/CURRINFO/current,GUX8DT3/CURRINFO/range,GUXADT2/CURRINFO/current,GUXADT2/CURRINFO/range,GUXIDC6/CURRINFO/current,GUXIDC6/CURRINFO/range,GUT2DCX/CURRINFO/current,GUT2DCX/CURRINFO/range,GUX8DC2/CURRINFO/current,GUX8DC2/CURRINFO/range,GUX8DC4/CURRINFO/current,GUX8DC4/CURRINFO/range,GUX8MU1/CURRENTI/currenti,GUX8MU1/CURRENTS/currents,GUX8QD11/CURRENTI/currenti,GUX8QD11/CURRENTS/currents,GUX8QD12/CURRENTI/currenti,GUX8QD12/CURRENTS/currents"
CSPP_AccRestSVInterface:CSPP_AccRestSVInterface.PV_U32 = "GUX8DT3/STATUS/status,GUXADT2/STATUS/status,GUXIDC6/STATUS/status,GUT2DCX/STATUS/status,GUX8DC2/STATUS/status,GUX8DC4/STATUS/status,GUX8MU1/STATUS/status,GUX8QD11/STATUS/status,GUX8QD12/STATUS/status,GUT2DCX_P/STATUS/status,GUX8DC2_P/STATUS/status,GUX8DC4_P/STATUS/status,GUXFVV1S/STATUS/status,GUXIDC6_P/STATUS/status,GUXIVV1S/STATUS/status"
CSPP_AccRestSVInterface:CSPP_AccRestSVInterface.PV_U16 = "GUX8DT3/ACTIV/activ,GUXADT2/ACTIV/activ,GUXIDC6/ACTIV/activ,GUT2DCX/ACTIV/activ,GUX8DC2/ACTIV/activ,GUX8DC4/ACTIV/activ,GUX8MU1/ACTIV/activ,GUX8QD11/ACTIV/activ,GUX8QD12/ACTIV/activ,GUT2DCX_P/POSITI/position,GUT2DCX_P/ACTIV/activ,GUX8DC2_P/POSITI/position,GUX8DC2_P/POSITS/position,GUX8DC2_P/ACTIV/activ,GUX8DC4_P/POSITI/position,GUX8DC4_P/POSITS/position,GUX8DC4_P/ACTIV/activ,GUXFVV1S/POSITI/positioni,GUXFVV1S/ACTIV/activ,GUXIDC6_P/POSITI/position,GUXIDC6_P/ACTIV/activ,GUXIVV1S/POSITI/positioni,GUXIVV1S/ACTIV/activ"
[AccRestSVInterface.URLs]
Error="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_Error?.1"
ErrorCode="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_ErrorCode?.1"
ErrorMessage="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_ErrorMessage?.1"
ErrorStatus="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_ErrorStatus?.1"
PollingCounter="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingMode?.1"
PollingTime="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_PollingTime?.1"
Initialized="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_Initialized?.1"
GUX8DT3/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUX8DT3.current"
GUX8DT3/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUX8DT3.range"
GUX8DT3/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DT3.status"
GUX8DT3/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DT3.activ"
GUXADT2/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUXADT2.current"
GUXADT2/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUXADT2.range"
GUXADT2/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUXADT2.status"
GUXADT2/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUXADT2.activ"
GUXIDC6/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6.current"
GUXIDC6/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6.range"
GUXIDC6/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6.status"
GUXIDC6/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6.activ"
GUT2DCX/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX.current"
GUT2DCX/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX.range"
GUT2DCX/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX.status"
GUT2DCX/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX.activ"
GUX8DC2/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2.current"
GUX8DC2/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2.range"
GUX8DC2/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2.status"
GUX8DC2/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2.activ"
GUX8DC4/CURRINFO/current="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4.current"
GUX8DC4/CURRINFO/range="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4.range"
GUX8DC4/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4.status"
GUX8DC4/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4.activ"
GUX8MU1/CURRENTI/currenti="ni.var.psp://localhost/UTCS_AccRest/GUX8MU1.currenti"
GUX8MU1/CURRENTS/currents="ni.var.psp://localhost/UTCS_AccRest/GUX8MU1.currents"
GUX8MU1/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8MU1.status"
GUX8MU1/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8MU1.activ"
GUX8QD11/CURRENTI/currenti="ni.var.psp://localhost/UTCS_AccRest/GUX8QD11.currenti"
GUX8QD11/CURRENTS/currents="ni.var.psp://localhost/UTCS_AccRest/GUX8QD11.currents"
GUX8QD11/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8QD11.status"
GUX8QD11/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8QD11.activ"
GUX8QD12/CURRENTI/currenti="ni.var.psp://localhost/UTCS_AccRest/GUX8QD12.currenti"
GUX8QD12/CURRENTS/currents="ni.var.psp://localhost/UTCS_AccRest/GUX8QD12.currents"
GUX8QD12/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8QD12.status"
GUX8QD12/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8QD12.activ"
GUT2DCX_P/POSITI/position="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX_P.positi"
GUT2DCX_P/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX_P.status"
GUT2DCX_P/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUT2DCX_P.activ"
GUX8DC2_P/POSITI/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2_P.positi"
GUX8DC2_P/POSITS/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2_P.posits"
GUX8DC2_P/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2_P.status"
GUX8DC2_P/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2_P.activ"
GUX8DC4_P/POSITI/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.positi"
GUX8DC4_P/POSITS/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.posits"
GUX8DC4_P/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.status"
GUX8DC4_P/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.activ"
GUX8DC4_P/POSITI/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.positi"
GUX8DC4_P/POSITS/position="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.posits"
GUX8DC4_P/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.status"
GUX8DC4_P/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.activ"
GUXFVV1S/POSITI/positioni="ni.var.psp://localhost/UTCS_AccRest/GUXFVV1S.positi"
GUXFVV1S/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUXFVV1S.status"
GUXFVV1S/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUXFVV1S.activ"
GUXIDC6_P/POSITI/position="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6_P.positi"
GUXIDC6_P/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6_P.status"
GUXIDC6_P/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUXIDC6_P.activ"
GUXIVV1S/POSITI/positioni="ni.var.psp://localhost/UTCS_AccRest/GUXIVV1S.positi"
GUXIVV1S/STATUS/status="ni.var.psp://localhost/UTCS_AccRest/GUXIVV1S.status"
GUXIVV1S/ACTIV/activ="ni.var.psp://localhost/UTCS_AccRest/GUXIVV1S.activ"
[AccRestSVInterfaceProxy]
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="AccRestSVInterface"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[AccRestSVInterfaceProxy.URLs]
Activate="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterfaceProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterfaceProxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UTCS_AccRest/AccRestSVInterface_Set-PollingStartStop?.1"
Write_U16_Msg="ni.var.psp://localhost/UTCS_AccRest/GUX8DC2_P.posits,ni.var.psp://localhost/UTCS_AccRest/GUX8DC4_P.posits"
Write_Sgl_Msg="ni.var.psp://localhost/UTCS_AccRest/GUX8MU1.currents,ni.var.psp://localhost/UTCS_AccRest/GUX8QD11.currents,ni.var.psp://localhost/UTCS_AccRest/GUX8QD12.currents"
This diff is collapsed.
Subproject commit f86d6fa81c8b7ff6b57f642ab4926e3f642385fd
Subproject commit a167cef244772cd750e80c7125bb23db0096ec1b
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