Commit eab600e9 authored by Holger Brand's avatar Holger Brand
Browse files

Update submodule; Main-App actor can now be specified explicitly.

parent 311b4f7b
Subproject commit 3edcd51828114b60c2452485ca28665489931030
Subproject commit fdd9de38731de228a98c3b9bc360f9787806e798
Subproject commit b03bc2608ae6236503b74b4ac8f1eeb52786a727
Subproject commit 521b592ff682a1d6bc3680b647c1ce222a3e3853
......@@ -1272,21 +1272,21 @@ Polling_Interval_Msg="ni.var.psp://kcpc080/CSPP-Watchdog-SV/Watchdog_Set-Polling
Polling_Iterations_Msg="ni.var.psp://kcpc080/CSPP-Watchdog-SV/Watchdog_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://kcpc080/CSPP-Watchdog-SV/Watchdog_Set-PollingStartStop"
Watchdog_PV_Msg="ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/RTCGC_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-1_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-4_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_PollingCounter,ni.var.psp://KCPC080/UTCS_IGA140_SV/IGA140_PollingCounter"
[A_ObjectManager]
[ObjectManager]
LVClassPath="CSPP_ObjectManager.lvlib:CSPP_ObjectManager.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1
CSPP_BaseActor:CSPP_BaseActor.PVProxy="A_ObjectManagerProxy"
CSPP_BaseActor:CSPP_BaseActor.PVProxy="ObjectManagerProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_ObjectManager:CSPP_ObjectManager.ActorList=StartActor.ActorList
[A_ObjectManagerProxy]
[ObjectManagerProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="A_ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
CSPP_PVProxy:CSPP_PVProxy.IgnoreFirstUpdate=False
[A_ObjectManagerProxy.URLs]
[ObjectManagerProxy.URLs]
Activate="ni.var.psp://localhost/UTCS_AE/ObjectManagerProxy_Activate"
WorkerActor="ni.var.psp://localhost/UTCS_AE/ObjectManagerProxy_WorkerActor"
#Polling_Interval_Msg="ni.var.psp://localhost/UTCS_AE/ObjectManager_Set-PollingInterval"
......@@ -1303,6 +1303,8 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.NoAppRoot=False
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
[StartActor.URLs]
#PollingCounter="ni.var.psp://localhost/UTCS_AE/StartActor_PollingCounter"
#PollingDeltaT="ni.var.psp://localhost/UTCS_AE/StartActor_PollingDeltaT"
......@@ -1316,7 +1318,7 @@ ActorList="ni.var.psp://localhost/UTCS_AE/ActorList"
[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.
1UTCS_MainGUI=False
UTCS_MainGUI=False
IGA140=False
RTCGC=True
TASCAGC=True
......
......@@ -1215,7 +1215,7 @@ Set-MP-Length-IL-Max="ni.var.psp://kcpc080/UTCS_AE/Set-MP-Length-IL-Max"
Set-Dipole-IMax="ni.var.psp://kcpc080/UTCS_AE/Set-Dipole-IMax"
Set-Dipole-IMin="ni.var.psp://kcpc080/UTCS_AE/Set-Dipole-IMin"
[1UTCS_MainGUI]
[UTCS_MainGUI]
LVClassPath="UTCS_MainGUI.lvlib:UTCS_MainGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
UTCS_MainGUI:UTCS_MainGUI.BMIL="BMIL"
......@@ -1272,21 +1272,21 @@ Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-Polli
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-PollingStartStop"
Watchdog_PV_Msg="ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/RTCGC_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-1_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-4_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_PollingCounter,ni.var.psp://KCPC080/UTCS_IGA140_SV/IGA140_PollingCounter"
[A_ObjectManager]
[ObjectManager]
LVClassPath="CSPP_ObjectManager.lvlib:CSPP_ObjectManager.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1
CSPP_BaseActor:CSPP_BaseActor.PVProxy="A_ObjectManagerProxy"
CSPP_BaseActor:CSPP_BaseActor.PVProxy="ObjectManagerProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_ObjectManager:CSPP_ObjectManager.ActorList=StartActor.ActorList
[A_ObjectManagerProxy]
[ObjectManagerProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="A_ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
CSPP_PVProxy:CSPP_PVProxy.IgnoreFirstUpdate=False
[A_ObjectManagerProxy.URLs]
[ObjectManagerProxy.URLs]
Activate="ni.var.psp://localhost/UTCS_AE/ObjectManagerProxy_Activate"
WorkerActor="ni.var.psp://localhost/UTCS_AE/ObjectManagerProxy_WorkerActor"
#Polling_Interval_Msg="ni.var.psp://localhost/UTCS_AE/ObjectManager_Set-PollingInterval"
......@@ -1303,6 +1303,8 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.NoAppRoot=False
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="UTCS_MainGUI"
[StartActor.URLs]
#PollingCounter="ni.var.psp://localhost/UTCS_AE/StartActor_PollingCounter"
#PollingDeltaT="ni.var.psp://localhost/UTCS_AE/StartActor_PollingDeltaT"
......@@ -1316,7 +1318,7 @@ ActorList="ni.var.psp://localhost/UTCS_AE/ActorList"
[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.
1UTCS_MainGUI=False
UTCS_MainGUI=False
IGA140=False
RTCGC=True
TASCAGC=True
......
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