Commit ad3a3db0 authored by Holger Brand's avatar Holger Brand

Update submodule

parent 8dc9ec9f
......@@ -7,13 +7,24 @@ WebServer.TcpAccess="c+*.gsi.de"
# LibraryName:ClassName.AttributeName=""
[PV_Protocols]
ni.var.psp=DSCConnection
#ni.var.psp=DSCConnection
#ni.var.psp=SVConnection
#dstp=DSConnection
dim=DIMConnection
dim_c=DIMConnection
dim_e=DIMConnection
dim_p=DIMConnection
[PV_Monitors]
#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
dim_p=DIMMonitor
dim_e=DIMMonitor
dim_c=DIMCommandMonitor
dim_cs=CS_CommandMonitor
[DIMConnection]
LVClassPath="CSPP_DIM.lvlib:DIMConnection.lvclass"
CSPP_DIM:DIMConnection.ServerName="PCMON/eelpc007"
......@@ -24,17 +35,6 @@ LVClassPath="CSPP_ProcessVariables.lvlib:DSConnection.lvclass"
[SVConnection]
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
#dstp_p=DSMonitor
#dstp_e=DSMonitor
dim_p=DIMMonitor
dim_e=DIMMonitor
dim_c=DIMCommandMonitor
dim_cs=CS_CommandMonitor
[DIMMonitor]
LVClassPath="CSPP_DIMMonitor.lvlib:CSPP_DIMMonitor.lvclass"
[DIMMonitor_p]
......@@ -85,16 +85,16 @@ CSPP_StartActor:CSPP_StartActor.Open_ActorCore=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
#CSPP_StartActor:CSPP_StartActor.MessageLogger=""
CSPP_StartActor:CSPP_StartActor.MessageLogger="DSClog"
CSPP_StartActor:CSPP_StartActor.MessageLogger=""
#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=True
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager"
#CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="SystemMonitor"
#CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="ObjectManager"
CSPP_StartActor:CSPP_StartActor.ApplicationRootActors="SystemMonitor"
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
ObjectManager=False
#ObjectManager=False
SystemMonitor=False
[StartActor.ActorList]
List of Actor objects to be started manually, with option to relaunch.
......@@ -123,7 +123,7 @@ CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="SystemMonitorProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=False
CSPP_SystemMonitor:CSPP_SystemMonitor.Drives="C:\\,D:\\"
[SystemMonitor.URLs]
[SystemMonitor.SVURLs]
PollingCounter="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingInterval"
......@@ -139,7 +139,7 @@ Usage_0="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Usage_C"
Size_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Size_D"
Free_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Free_D"
Usage_1="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Usage_D"
[SystemMonitor.DIMURLs]
[SystemMonitor.URLs]
#PollingCounter="dim://localhost/PCMON/eelpc007/PollingCounter"
#PollingDeltaT="dim://localhost/PCMON/eelpc007/PollingDeltaT"
#PollingInterval="dim://localhost/PCMON/eelpc007/PollingInterval"
......@@ -154,3 +154,17 @@ Usage_0="dim://localhost/PCMON/eelpc007/Usage_C"
Size_1="dim://localhost/PCMON/eelpc007/Size_D"
Free_1="dim://localhost/PCMON/eelpc007/Free_D"
Usage_1="dim://localhost/PCMON/eelpc007/Usage_D"
[SystemMonitorProxy]
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="SystemMonitor"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[SystemMonitorProxy.URLs]
Activate="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor?.1"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingInterval"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingStartStop"
This diff is collapsed.
Subproject commit 8c28582d0b916aaf8d7d23a3266889297c61c902
Subproject commit e187d0f61ae2f099419cd3fdfc1685515f13f2bb
......@@ -338,6 +338,51 @@ Bound shared variabes with alarming and trending can be configured here.</Proper
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!"E!A!!!!!!"!!5!#A!!!1!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitor_Set-PollingInterval" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:AccessType" Type="Str">read/write</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:ProjectBinding" Type="Str">False</Property>
<Property Name="Network:SingleWriter" Type="Str">False</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/RADRIS.lvproj/My Computer/CSPP/Utilities/CSPP_SystemMonitor_SV.lvlib/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!"E!A!!!!!!"!!5!#A!!!1!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitor_Set-PollingIterations" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:AccessType" Type="Str">read/write</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:ProjectBinding" Type="Str">False</Property>
<Property Name="Network:SingleWriter" Type="Str">False</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/RADRIS.lvproj/My Computer/CSPP/Utilities/CSPP_SystemMonitor_SV.lvlib/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!&gt;'1!!!"E!A!!!!!!"!!5!"Q!!!1!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitor_Set-PollingStartStop" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:AccessType" Type="Str">read/write</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:ProjectBinding" Type="Str">False</Property>
<Property Name="Network:SingleWriter" Type="Str">False</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/RADRIS.lvproj/My Computer/CSPP/Utilities/CSPP_SystemMonitor_SV.lvlib/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!:&amp;1!!!"E!A!!!!!!"!!1!)1!"!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitor_Size_C" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
......@@ -390,4 +435,34 @@ Bound shared variabes with alarming and trending can be configured here.</Proper
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!"E!A!!!!!!"!!5!#A!!!1!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitorProxy_Activate" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:AccessType" Type="Str">read/write</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:ProjectBinding" Type="Str">False</Property>
<Property Name="Network:SingleWriter" Type="Str">False</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/RADRIS.lvproj/My Computer/CSPP/Utilities/CSPP_SystemMonitor_SV.lvlib/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!:&amp;1!!!"E!A!!!!!!"!!1!)1!"!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="SystemMonitorProxy_WorkerActor" Type="Variable">
<Property Name="Alarming:EventOnDataChange" Type="Str">False</Property>
<Property Name="Alarming:EventOnUserInputOnly" Type="Str">True</Property>
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:AccessType" Type="Str">read/write</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:ProjectBinding" Type="Str">False</Property>
<Property Name="Network:SingleWriter" Type="Str">True</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/RADRIS.lvproj/My Computer/CSPP/Utilities/CSPP_SystemMonitor_SV.lvlib/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!I*!!!!"E!A!!!!!!"!""!-0````]'5X2S;7ZH!!!"!!!!!!!!!!!!!!!!!!!</Property>
</Item>
</Library>
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