Commit e00e0216 authored by Dennis Neidherr's avatar Dennis Neidherr 😲

Added a build script for the CSPP_TDC8HP exe and some additional bugfixes

parent 3b526e9f
......@@ -113,7 +113,7 @@ CSPP_StartActor:CSPP_StartActor.MessageLogger="QMessageLogger"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.SequentialStartActors=""
CSPP_StartActor:CSPP_StartActor.GuiShutdownBehaviour="Hide" #Determine behavior closing DeviceGUI actor FP. Options: Manual, Couple, Hide
CSPP_StartActor:CSPP_StartActor.GuiShutdownBehaviour="Couple" #Determine behavior closing DeviceGUI actor FP. Options: Manual, Couple, Hide
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="" #CSV list of root actors launched by StartActor leading to application exit.
CSPP_StartActor:CSPP_StartActor.DefaultSaveDirectory="Set-tmp"
[StartActor.URLs]
......@@ -138,7 +138,7 @@ ObjectManager=False
List of Actor objects to be started manually, with option to relaunch.
#DSCManager=False
QMessageLoggerMonitor=False
#myTDC8HP=False
myTDC8HP=False
myFPGA-PPG=False
myMMSequencer=False
myFPGA-MCS=False
......@@ -195,14 +195,15 @@ LVClassPath="CSPP_TDC8HP.lvlib:CSPP_TDC8HP.lvclass"
#CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_TDC8HPGUI.lvlib:CSPP_TDC8HPGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="myTDC8HPGUI"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
#CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myTDC8HPProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName=""
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStart_ns=0
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStop_ns=70
CSPP_TDC8HP:CSPP_TDC8HP.SimulationMode=False
CSPP_TDC8HP:CSPP_TDC8HP.SimulationMode=True
CSPP_TDC8HP:CSPP_TDC8HP.PublishInterval_s=1
[myTDC8HPGUI]
LVClassPath="CSPP_TDC8HPGUI.lvlib:CSPP_TDC8HPGUI.lvclass"
......@@ -229,6 +230,7 @@ PauseTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_PauseTDC
SimMode_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_SimMode_Msg"
StartTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_StartTDCs_Msg"
StopTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_StopTDCs_Msg"
Read_Data_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_Read_Data_Msg"
[myPPGTestGui]
LVClassPath="PPGTest.lvlib:PPGTest.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......
This diff is collapsed.
No preview for this file type
Subproject commit 2203e92ed8ca2decbe6daa684ac2b6ebf1c8c247
Subproject commit 5c121f995d6505f9d6aa083610911e31d4b93491
Subproject commit c8a62e4512c3351882325330097654092e758156
Subproject commit f37e97407e3c171d6470d2e78a1e6706750c3b52
Subproject commit 93cb9d08ff5ee5c16cbb436b04f15aa2c5a424bd
Subproject commit 93c94ba8251921455a82e7a91d152ad01fbf7bdf
[CSPP_TDC8HP]
WebServer.Enabled=False
WebServer.TcpAccess="c+*.gsi.de"
HideRootWindow = True
DefaultDataFileLocation=D:\CSPP\Data
# The application uses decimal point as decimal delimiter.
# Class attributes are specified as follows. All values are parsed as strings.
# LibraryName:ClassName.AttributeName=""
[PV_Protocols]
ni.var.psp=SVConnection
[SVConnection]
LVClassPath="CSPP_SharedVariables.lvlib:SVConnection.lvclass"
[PV_Monitors]
ni.var.psp_p=SVMonitor
ni.var.psp_e=SVMonitor
[SVMonitor]
LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
[StartActor]
LVClassPath="CSPP_StartActor.lvlib:CSPP_StartActor.lvclass"
CSPP_StartActor:CSPP_StartActor.Open_ActorCore=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_StartActor:CSPP_StartActor.MessageLogger=""
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.GuiShutdownBehaviour="Couple" #Determine behavior closing DeviceGUI actor FP. Options: Manual, Couple, Hide
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="myTDC8HP" #CSV list of root actors launched by StartActor leading to application exit.
CSPP_StartActor:CSPP_StartActor.DefaultSaveDirectory="D:\CSPP\Settings"
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
#ObjectManager=False
myTDC8HP=False
[StartActor.ActorList]
List of Actor objects to be started manually, with option to relaunch.
myTDC8HP=False
[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="ObjectManagerProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_ObjectManager:CSPP_ObjectManager.ActorList=StartActor.ActorList
[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="ObjectManager"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
CSPP_PVProxy:CSPP_PVProxy.IgnoreFirstUpdate=False
[ObjectManagerProxy.URLs]
Activate="ni.var.psp://localhost/ST_MM/ObjectManagerProxy_Activate"
WorkerActor="ni.var.psp://localhost/ST_MM/ObjectManagerProxy_WorkerActor"
Update_Process_Info_Msg="ni.var.psp://localhost/ST_MM/ActorList"
[myTDC8HP]
LVClassPath="CSPP_TDC8HP.lvlib:CSPP_TDC8HP.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_TDC8HPGUI.lvlib:CSPP_TDC8HPGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.01
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myTDC8HP_Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName=""
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStart_ns=0
CSPP_TDC8HP:CSPP_TDC8HP.GroupRangeStop_ns=70
CSPP_TDC8HP:CSPP_TDC8HP.SimulationMode=False
CSPP_TDC8HP:CSPP_TDC8HP.PublishInterval_s=0.1
[myTDC8HP.URLs]
Error="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_Error"
SimulationMode="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_SimulationMode"
GroupStart="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_GroupStart"
GroupStop="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_GroupStop"
ActEvent="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_ActEvent"
TDCStarted="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_TDCStarted"
TDCPaused="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_TDCPaused"
TDCBlocked="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HP_TDCBlocked"
[myTDC8HP_Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_TDC8HPGUI.lvlib:CSPP_TDC8HPGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myTDC8HP"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[myTDC8HP_Proxy.URLs]
Activate="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_Activate"
Initialize_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_Initialize_Msg"
PauseTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_PauseTDCs_Msg"
SimMode_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_SimMode_Msg"
StartTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_StartTDCs_Msg"
StopTDCs_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_StopTDCs_Msg"
Read_Data_Msg="ni.var.psp://localhost/CSPP_Acquisition_SV/myTDC8HPProxy_Read_Data_Msg"
\ No newline at end of file
Subproject commit 2717036648349bad291220b9b2002744f5c367bd
Subproject commit 75eef9527645675c092e01cd8172cc06bd0eae1a
Subproject commit 60318fdd580542ca8d1aad3cb6a2201c481955cd
Subproject commit 6d942a283e01af3e1129093490711d1df818851f
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