Commit 96617bef authored by Holger Brand's avatar Holger Brand
Browse files

Update submodules; Launch nested actors from GUIs AfterLaunchInit: improve GUI and S2GT.lvlib

parent e038fd5f
Subproject commit 3264ea264a2fab7746be5f63a8364145b5ac7d81
Subproject commit 198752bcbd5038d01b8a1541d32a422ea306fd65
Subproject commit bdda064ac175d214eb599e31711660caf6fcfabc
Subproject commit 33f82d7f4edbdffa34b2b9ccdd2a57e3a702de35
Subproject commit 05accd66db682c5164d59bc84a0c623041f7e7b8
Subproject commit 8c28582d0b916aaf8d7d23a3266889297c61c902
Subproject commit 13a7bbc5c319e699e618f3468a0fd9230a5a619b
Subproject commit 67e61e9b9b37cf121460d4ca8e42cb0899b4b915
Subproject commit df12b620bfb4ab949bf36c44d5de0df55a1076cc
Subproject commit e87c721c02d6ec91ee386183953108638db7641e
......@@ -7,11 +7,8 @@ WebServer.TcpAccess="c+*.gsi.de"
[PV_Protocols]
ni.var.psp=DSCConnection
#ni.var.psp=SVConnection
#dstp=DSConnection
[DSCConnection]
LVClassPath="CSPP_DSCConnection.lvlib:DSCConnection.lvclass"
[DSConnection]
LVClassPath="CSPP_ProcessVariables.lvlib:DSConnection.lvclass"
[SVConnection]
LVClassPath="CSPP_SharedVariables.lvlib:SVConnection.lvclass"
#_p:Polling; _e:Events
......@@ -20,16 +17,10 @@ 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]
LVClassPath="CSPP_DSCMonitor.lvlib:CSPP_DSCMonitor.lvclass"
[DSMonitor]
LVClassPath="CSPP_DSMonitor.lvlib:CSPP_DSMonitor.lvclass"
[SVMonitor]
LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
[CSPP_MessageLogger]
LVClassPath="CSPP_BaseClasses.lvlib:CSPP_MessageLogger.lvclass"
[BaseActor]
LVClassPath="CSPP_BaseActor.lvlib:CSPP_BaseActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......@@ -57,7 +48,7 @@ CSPP_PVProxy:CSPP_PVProxy.WorkerActor="BaseActor"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[BaseActorProxy.URLs]
Activate="ni.var.psp://localhost/CSPP_Core_SV/BaseActorProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP_Core_SV/BaseActorProxy_WorkerActor|1024?.1"
WorkerActor="ni.var.psp://localhost/CSPP_Core_SV/BaseActorProxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP_Core_SV/BaseActor_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP_Core_SV/BaseActor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP_Core_SV/BaseActor_Set-PollingStartStop"
......@@ -76,11 +67,11 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="DeviceActorProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="COM1"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=False
CSPP_DeviceActors:CSPP_DeviceActor.OptionString="Simulate=0,RangeCheck=1,QueryInstrStatus=0,Cache=1"
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="COM1"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=False
CSPP_DeviceActor:CSPP_DeviceActor.OptionString="Simulate=0,RangeCheck=1,QueryInstrStatus=0,Cache=1"
CSPP_DeviceActor:CSPP_DeviceActor.ResetWithDefaults=False
[DeviceActor.URLs]
PollingCounter="ni.var.psp://localhost/CSPP_Core_SV/DeviceActor_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/CSPP_Core_SV/DeviceActor_PollingDeltaT"
......@@ -127,19 +118,21 @@ CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.StartActors=StartActor.StartActors
CSPP_StartActor:CSPP_StartActor.ActorList=StartActor.ActorList
CSPP_StartActor:CSPP_StartActor.GuiWorkerCoupling=False #Determine behavior closing GUI actor FP. Set True if stopping a GUI triggers stop of worker actor.
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager" #CSV list of root actors launched by StartActor leading to application exit.
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="S2GT_MainGUI" #CSV list of root actors launched by StartActor leading to application exit.
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
ObjectManager=False
S2GT_MainGUI=False
#ObjectManager=False
SystemMonitor=False
#BaseActor=False
#BaseActorGUI=False
#DeviceActor=False
#DeviceActorGUI=False
#LS218=False
Valve=False
#Valve=False
[StartActor.ActorList]
List of Actor objects to be started manually, with option to relaunch.
S2GT_MainGUI=False
Beep=True
BaseActor=False
BaseActorGUI=False
......@@ -152,6 +145,8 @@ ObjectManager=False
SystemMonitor=False
LS218=False
LS218GUI=False
PR4000=False
PR4000GUI=False
Valve=False
ValveGUI=False
[StartActor.URLs]
......@@ -267,7 +262,7 @@ CSPP_PVProxy:CSPP_PVProxy.WorkerActor="SystemMonitor"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[SystemMonitorProxy.URLs]
Activate="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitorProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitorProxy_WorkerActor|1024?.1"
WorkerActor="ni.var.psp://localhost/CSPP_SystemMonitor_SV/SystemMonitorProxy_WorkerActor?.1"
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"
......@@ -278,11 +273,11 @@ LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.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_DeviceActor:CSPP_DeviceActor.ResourceName="/PXI1Slot4"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActor:CSPP_DeviceActor.OptionString=""
CSPP_DeviceActor: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"
......@@ -345,36 +340,36 @@ CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
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.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"
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="GPIB0::5::INSTR"
CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
LS218:LS218.SensorCalibration="C:\User\Brand\LVP\S2GT\Packages\LS218\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"
Error="ni.var.psp://localhost/S2GT/LS218_Error?.1"
ErrorCode="ni.var.psp://localhost/S2GT/LS218_ErrorCode?.1"
ErrorMessage="ni.var.psp://localhost/S2GT/LS218_ErrorMessage?.1"
ErrorStatus="ni.var.psp://localhost/S2GT/LS218_ErrorStatus?.1"
PollingCounter="ni.var.psp://localhost/S2GT/LS218_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/S2GT/LS218_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/S2GT/LS218_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/S2GT/LS218_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/S2GT/LS218_PollingMode?.1"
PollingTime="ni.var.psp://localhost/S2GT/LS218_PollingTime?.1"
ResourceName="ni.var.psp://localhost/S2GT/LS218_ResourceName?.1"
DriverRevision="ni.var.psp://localhost/S2GT/LS218_DriverRevision?.1"
FirmwareRevision="ni.var.psp://localhost/S2GT/LS218_FirmwareRevision?.1"
SelftestResultCode="ni.var.psp://localhost/S2GT/LS218_SelftestResultCode?.1"
SelftestResultMessage="ni.var.psp://localhost/S2GT/LS218_SelftestResultMessage?.1"
T0="ni.var.psp://localhost/S2GT/LS218_T0"
T1="ni.var.psp://localhost/S2GT/LS218_T1"
Relay="ni.var.psp://localhost/S2GT/LS218_Relay"
S0="ni.var.psp://localhost/S2GT/LS218_S0"
S1="ni.var.psp://localhost/S2GT/LS218_S1"
SN0="ni.var.psp://localhost/S2GT/LS218_SN0"
SN1="ni.var.psp://localhost/S2GT/LS218_SN1"
[LS218Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
......@@ -383,20 +378,20 @@ 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"
Activate="ni.var.psp://localhost/S2GT/LS218Proxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/S2GT/LS218Proxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/S2GT/LS218_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/S2GT/LS218_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/S2GT/LS218_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/S2GT/LS218_Reset?.1"
Selftest_Device_Msg="ni.var.psp://localhost/S2GT/LS218_SelfTest?.1"
Configure_Alarms_Msg="ni.var.psp://localhost/S2GT/LS218_Set-ConfigureAlarms"
Configure_Relays_Msg="ni.var.psp://localhost/S2GT/LS218_Set-ConfigureRelays"
Log_Data_Msg="ni.var.psp://localhost/S2GT/LS218_Set-LogData"
Reset_Alarms_Msg="ni.var.psp://localhost/S2GT/LS218_Set-ResetAlarms"
Reset_Min-Max_Msg="ni.var.psp://localhost/S2GT/LS218_Set-ResetMinMax"
Write_Single_Calibration_Curve_to_Instrument_Msg="ni.var.psp://localhost/S2GT/LS218_Set-SingleCalibrationCurvetoInstrument"
Write_calibration_curves_to_instruments_Msg="ni.var.psp://localhost/S2GT/LS218_Set-CalibrationCurvestoInstruments"
[LS218GUI]
LVClassPath="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
......@@ -411,7 +406,7 @@ CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_PR4000GUI.lvlib:CSPP_PR4000GUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="PR4000Proxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="COM1"
......@@ -424,7 +419,7 @@ CSPP_PR4000:CSPP_PR4000.NofChannels=2
[PR4000.URLs]
Error="ni.var.psp://localhost/S2GT/PR4000_Error?.1"
ErrorCode="ni.var.psp://localhost/S2GT/PR4000_ErrorCode?.1"
ErrorMessage="ni.var.psp://localhost/S2GT/PR4000_ErrorMessage|1024?.1"
ErrorMessage="ni.var.psp://localhost/S2GT/PR4000_ErrorMessage?.1"
ErrorStatus="ni.var.psp://localhost/S2GT/PR4000_ErrorStatus?.1"
PollingCounter="ni.var.psp://localhost/S2GT/PR4000_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/S2GT/PR4000_PollingDeltaT?.1"
......@@ -436,8 +431,8 @@ ResourceName="ni.var.psp://localhost/S2GT/PR4000_ResourceName?.1"
DriverRevision="ni.var.psp://localhost/S2GT/PR4000_DriverRevision?.1"
FirmwareRevision="ni.var.psp://localhost/S2GT/PR4000_FirmwareRevision?.1"
SelftestResultCode="ni.var.psp://localhost/S2GT/PR4000_SelftestResultCode?.1"
SelftestResultMessage="ni.var.psp://localhost/S2GT/PR4000_SelftestResultMessage|1024?.1"
NofChannel="ni.var.psp://localhost/S2GT/PR4000_NofChannels"
SelftestResultMessage="ni.var.psp://localhost/S2GT/PR4000_SelftestResultMessage?.1"
NofChannels="ni.var.psp://localhost/S2GT/PR4000_NofChannels"
Resolution="ni.var.psp://localhost/S2GT/PR4000_Resolution"
Status_0="ni.var.psp://localhost/S2GT/PR4000_Status"
Relay_0="ni.var.psp://localhost/S2GT/PR4000_Relay_0"
......@@ -447,7 +442,7 @@ RangeValue_0="ni.var.psp://localhost/S2GT/PR4000_RangeValue_0"
RangeUnit_0="ni.var.psp://localhost/S2GT/PR4000_RangeUnit_0"
Setpoint_0="ni.var.psp://localhost/S2GT/PR4000_Setpoint_0"
Value_0="ni.var.psp://localhost/S2GT/PR4000_Value_0"
ExternalInput_0=ni.var.psp://localhost/S2GT/PR4000_ExternalInput_0"
ExternalInput_0="ni.var.psp://localhost/S2GT/PR4000_ExternalInput_0"
Relay_1="ni.var.psp://localhost/S2GT/PR4000_Relay_1"
Valve_1="ni.var.psp://localhost/S2GT/PR4000_Valve_1"
Range_1="ni.var.psp://localhost/S2GT/PR4000_Range_1"
......@@ -455,7 +450,7 @@ RangeValue_1="ni.var.psp://localhost/S2GT/PR4000_RangeValue_1"
RangeUnit_1="ni.var.psp://localhost/S2GT/PR4000_RangeUnit_1"
Setpoint_1="ni.var.psp://localhost/S2GT/PR4000_Setpoint_1"
Value_1="ni.var.psp://localhost/S2GT/PR4000_Value_1"
ExternalInput_1=ni.var.psp://localhost/S2GT/PR4000_ExternalInput_1"
ExternalInput_1="ni.var.psp://localhost/S2GT/PR4000_ExternalInput_1"
[PR4000Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_PR4000GUI.lvlib:CSPP_PR4000GUI.lvclass"
......@@ -465,7 +460,7 @@ CSPP_PVProxy:CSPP_PVProxy.WorkerActor="PR4000"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[PR4000Proxy.URLs]
Activate="ni.var.psp://localhost/S2GT/PR4000Proxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/S2GT/PR4000Proxy_WorkerActor|1024?.1"
WorkerActor="ni.var.psp://localhost/S2GT/PR4000Proxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/S2GT/PR4000_Set-PollingStartStop?.1"
......
This diff is collapsed.
This diff is collapsed.
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