Commit fa29cf64 authored by Holger Brand's avatar Holger Brand

New Release with Bugfix for DIM-Service names.

parent 00cff6a2
......@@ -85,11 +85,10 @@ 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"
[StartActor.StartActors]
......@@ -102,7 +101,7 @@ DSCAlarmViewer=False
DSCManager=False
DSCTrendViewer=False
SystemMonitor=False
[StartActor.#URLs]
[StartActor.URLs]
ActorList="ni.var.psp://localhost/CSPP-SystemMonitor/ActorList"
ErrorCode="ni.var.psp://localhost/CSPP-SystemMonitor/StartActor_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP-SystemMonitor/StartActor_ErrorMessage"
......@@ -121,7 +120,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="SystemMonitorProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=False
CSPP_SystemMonitor:CSPP_SystemMonitor.Drives="C:\\,D:\\"
[SystemMonitor.URLs]
PollingCounter="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitor_PollingCounter"
......@@ -139,13 +138,13 @@ 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.URLs]
PollingCounter="dim://localhost/PCMON/eelpc007/PollingCounter"
PollingDeltaT="dim://localhost/PCMON/eelpc007/PollingDeltaT"
PollingInterval="dim://localhost/PCMON/eelpc007/PollingInterval"
PollingIterations="dim://localhost/PCMON/eelpc007/PollingIterations"
PollingMode="dim://localhost/PCMON/eelpc007/PollingMode"
PollingTime="dim://localhost/PCMON/eelpc007/PollingTime"
[SystemMonitor.DIM-URLs]
PollingCounter="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingCounter"
#PollingDeltaT="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingDeltaT"
#PollingInterval="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingInterval"
#PollingIterations="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingIterations"
PollingMode="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingMode"
#PollingTime="dim://localhost/PCMON/eelpc007/SystemMonitor_PollingTime"
CPU-Load="dim://localhost/PCMON/eelpc007/PCTIME"
Memory="dim://localhost/PCMON/eelpc007/PCMEM"
Size_0="dim://localhost/PCMON/eelpc007/Size_C"
......@@ -163,13 +162,14 @@ 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"
Activate="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor"
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"
[SystemMonitorProxy.DIMURLs]
Activate="dim://localhost/CSPP-SystemMonitor/SystemMonitorProxy_Activate?.1"
WorkerActor="dim://localhost/CSPP-SystemMonitor/SystemMonitorProxy_WorkerActor?.1"
Polling_Interval_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingInterval"
Polling_Iterations_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="dim://localhost/CSPP-SystemMonitor/SystemMonitor_Set-PollingStartStop"
[SystemMonitorProxy.DIM-URLs]
#Activate="dim://localhost/PCMON/eelpc007/SystemMonitorProxy_Activate"
#WorkerActor="dim://localhost/PCMON/eelpc007/SystemMonitorProxy_WorkerActor?.1"
#Polling_Interval_Msg="dim://localhost/PCMON/eelpc007/SystemMonitor_Set-PollingInterval"
#Polling_Iterations_Msg="dim://localhost/PCMON/eelpc007/SystemMonitor_Set-PollingIterations"
#Polling_Start_Stop_Msg="dim://localhost/PCMON/eelpc007/SystemMonitor_Set-PollingStartStop"
This diff is collapsed.
Subproject commit 637efd932d2de160db489994a19f0074388ed2e8
Subproject commit 496eb286e65683f2ff791c22dc287251f7b4344b
Subproject commit bb97c5abbb2a04052351a4411643813bb1d0a862
Subproject commit b68f389d29002ea3858305db2584c21950b8ff06
Subproject commit f362917fdbc0fd1a350f8299cfa2bde5f4c3e8e1
Subproject commit 8e52d9e469154ca67de28e9fdc508339935737a4
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