Commit 8e4ea9af authored by Holger Brand's avatar Holger Brand
Browse files

Merge branch 'feature/UpdateAndRename' into develop

parents 39208029 1f84ec93
[CSPP-Template]
[ESRBB]
WebServer.Enabled=False
WebServer.TcpAccess="c+*.gsi.de"
# The application uses decimal point as decimal delimiter.
......@@ -155,7 +155,7 @@ CSPP_StartActor:CSPP_StartActor.SequentialStartActors=""
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.
[StartActor.URLs]
ActorList="ni.var.psp://localhost/CSPP-Template/ActorList"
ActorList="ni.var.psp://localhost/ESRBB/ActorList"
[StartActor.StartActors]
#Actor objects to start with option to relaunch.
ObjectManager=False
......@@ -190,17 +190,17 @@ CSPP_BeepActor:Beep.SystemAlert=False
CSPP_BeepActor:Beep.Frequency=440.
CSPP_BeepActor:Beep.Duration=1.
[Beep.URLs]
Error="ni.var.psp://localhost/CSPP-Template/Beep_Error"
ErrorCode="ni.var.psp://localhost/CSPP-Template/Beep_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP-Template/Beep_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/CSPP-Template/Beep_ErrorStatus"
Initialized="ni.var.psp://localhost/CSPP-Template/Beep_Initialized"
PollingCounter="ni.var.psp://localhost/CSPP-Template/Beep_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-Template/Beep_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-Template/Beep_PollingInterval"
PollingIterations="ni.var.psp://localhost/CSPP-Template/Beep_PollingIterations"
PollingMode="ni.var.psp://localhost/CSPP-Template/Beep_PollingMode"
PollingTime="ni.var.psp://localhost/CSPP-Template/Beep_PollingTime"
Error="ni.var.psp://localhost/ESRBB/Beep_Error"
ErrorCode="ni.var.psp://localhost/ESRBB/Beep_ErrorCode"
ErrorMessage="ni.var.psp://localhost/ESRBB/Beep_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/ESRBB/Beep_ErrorStatus"
Initialized="ni.var.psp://localhost/ESRBB/Beep_Initialized"
PollingCounter="ni.var.psp://localhost/ESRBB/Beep_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/ESRBB/Beep_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/ESRBB/Beep_PollingInterval"
PollingIterations="ni.var.psp://localhost/ESRBB/Beep_PollingIterations"
PollingMode="ni.var.psp://localhost/ESRBB/Beep_PollingMode"
PollingTime="ni.var.psp://localhost/ESRBB/Beep_PollingTime"
[BeepProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......@@ -210,16 +210,16 @@ CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="Beep"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[BeepProxy.URLs]
Activate="ni.var.psp://localhost/CSPP-Template/BeepProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-Template/BeepProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Template/Beep_PollingInterval"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Template/Beep_PollingStartStop"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Template/Beep_Set-PollingIterations"
Write_Beep_Parameters_Msg="ni.var.psp://localhost/CSPP-Template/Beep_Parameters"
Activate="ni.var.psp://localhost/ESRBB/BeepProxy_Activate"
WorkerActor="ni.var.psp://localhost/ESRBB/BeepProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/ESRBB/Beep_PollingInterval"
Polling_Start_Stop_Msg="ni.var.psp://localhost/ESRBB/Beep_PollingStartStop"
Polling_Iterations_Msg="ni.var.psp://localhost/ESRBB/Beep_Set-PollingIterations"
Write_Beep_Parameters_Msg="ni.var.psp://localhost/ESRBB/Beep_Parameters"
[DSCAlarmViewer]
LVClassPath="CSPP_DSCAlarmViewer.lvlib:CSPP_DSCAlarmViewer.lvclass"
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_0 = "\\\\localhost\\CSPP-Template"
CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_0 = "\\\\localhost\\ESRBB"
[DSCTrendViewer]
LVClassPath="CSPP_DSCTrendViewer.lvlib:CSPP_DSCTrendViewer.lvclass"
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
......@@ -227,7 +227,7 @@ CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
CSPP_DSCTrendViewer:CSPP_DSCTrendViewer.Configuration_File=""
[DSClog]
LVClassPath="CSPP_DSCMsgLogger.lvlib:CSPP_DSCMsgLogger.lvclass"
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Process="CSPP-Template"
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Process="ESRBB"
CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Error="Alarm" #Alarm or Event
[DSCManager]
LVClassPath="CSPP_DSCManager.lvlib:CSPP_DSCManager.lvclass"
......@@ -240,17 +240,17 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_ObjectManager:CSPP_ObjectManager.ActorList="StartActor.ActorList"
[ObjectManager.URLs]
Error="ni.var.psp://localhost/CSPP-Template/ObjectManager_Error"
ErrorCode="ni.var.psp://localhost/CSPP-Template/ObjectManager_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP-Template/ObjectManager_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/CSPP-Template/ObjectManager_ErrorStatus"
Initialized="ni.var.psp://localhost/CSPP-Template/ObjectManager_Initialized"
PollingCounter="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingInterval"
PollingIterations="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingIterations"
PollingMode="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingMode"
PollingTime="ni.var.psp://localhost/CSPP-Template/ObjectManager_PollingTime"
Error="ni.var.psp://localhost/ESRBB/ObjectManager_Error"
ErrorCode="ni.var.psp://localhost/ESRBB/ObjectManager_ErrorCode"
ErrorMessage="ni.var.psp://localhost/ESRBB/ObjectManager_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/ESRBB/ObjectManager_ErrorStatus"
Initialized="ni.var.psp://localhost/ESRBB/ObjectManager_Initialized"
PollingCounter="ni.var.psp://localhost/ESRBB/ObjectManager_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/ESRBB/ObjectManager_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/ESRBB/ObjectManager_PollingInterval"
PollingIterations="ni.var.psp://localhost/ESRBB/ObjectManager_PollingIterations"
PollingMode="ni.var.psp://localhost/ESRBB/ObjectManager_PollingMode"
PollingTime="ni.var.psp://localhost/ESRBB/ObjectManager_PollingTime"
[ObjectManagerProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -259,12 +259,12 @@ 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/CSPP-Template/ObjectManagerProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-Template/ObjectManagerProxy_WorkerActor"
#Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingInterval"
#Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingIterations"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Template/ObjectManager_Set-PollingStartStop"
Update_Process_Info_Msg="ni.var.psp://localhost/CSPP-Template/ActorList"
Activate="ni.var.psp://localhost/ESRBB/ObjectManagerProxy_Activate"
WorkerActor="ni.var.psp://localhost/ESRBB/ObjectManagerProxy_WorkerActor"
#Polling_Interval_Msg="ni.var.psp://localhost/ESRBB/ObjectManager_Set-PollingInterval"
#Polling_Iterations_Msg="ni.var.psp://localhost/ESRBB/ObjectManager_Set-PollingIterations"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/ESRBB/ObjectManager_Set-PollingStartStop"
Update_Process_Info_Msg="ni.var.psp://localhost/ESRBB/ActorList"
[SystemMonitor]
LVClassPath="CSPP_SystemMonitor.lvlib:CSPP_SystemMonitor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
......@@ -275,23 +275,23 @@ CSPP_BaseActor:CSPP_BaseActor.PVProxy="SystemMonitorProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_SystemMonitor:CSPP_SystemMonitor.Drives="C:\\"
[SystemMonitor.URLs]
Error="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Error"
ErrorCode="ni.var.psp://localhost/CSPP-Template/SystemMonitor_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP-Template/SystemMonitor_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/CSPP-Template/SystemMonitor_ErrorStatus"
Initialized="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Initialized"
PollingCounter="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingInterval"
PollingIterations="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingIterations"
PollingMode="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingMode"
PollingTime="ni.var.psp://localhost/CSPP-Template/SystemMonitor_PollingTime"
Initialized="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Initialized"
CPU-Load="ni.var.psp://localhost/CSPP-Template/SystemMonitor_CPU-Load"
Memory="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Memory"
Size_0="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Size_C"
Free_0="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Free_C"
Usage_0="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Usage_C"
Error="ni.var.psp://localhost/ESRBB/SystemMonitor_Error"
ErrorCode="ni.var.psp://localhost/ESRBB/SystemMonitor_ErrorCode"
ErrorMessage="ni.var.psp://localhost/ESRBB/SystemMonitor_ErrorMessage"
ErrorStatus="ni.var.psp://localhost/ESRBB/SystemMonitor_ErrorStatus"
Initialized="ni.var.psp://localhost/ESRBB/SystemMonitor_Initialized"
PollingCounter="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingInterval"
PollingIterations="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingIterations"
PollingMode="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingMode"
PollingTime="ni.var.psp://localhost/ESRBB/SystemMonitor_PollingTime"
Initialized="ni.var.psp://localhost/ESRBB/SystemMonitor_Initialized"
CPU-Load="ni.var.psp://localhost/ESRBB/SystemMonitor_CPU-Load"
Memory="ni.var.psp://localhost/ESRBB/SystemMonitor_Memory"
Size_0="ni.var.psp://localhost/ESRBB/SystemMonitor_Size_C"
Free_0="ni.var.psp://localhost/ESRBB/SystemMonitor_Free_C"
Usage_0="ni.var.psp://localhost/ESRBB/SystemMonitor_Usage_C"
[SystemMonitorProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -299,8 +299,8 @@ 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-Template/SystemMonitorProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-Template/SystemMonitorProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Set-PollingInterval"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Template/SystemMonitor_Set-PollingStartStop"
Activate="ni.var.psp://localhost/ESRBB/SystemMonitorProxy_Activate"
WorkerActor="ni.var.psp://localhost/ESRBB/SystemMonitorProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/ESRBB/SystemMonitor_Set-PollingInterval"
Polling_Iterations_Msg="ni.var.psp://localhost/ESRBB/SystemMonitor_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/ESRBB/SystemMonitor_Set-PollingStartStop"
This diff is collapsed.
File added
Subproject commit b3dc014641abb9067145b5a7c5e5c49264787b54
Subproject commit 1a71f971dae60bd074b811e384cf4578d79925b5
Subproject commit cb0953fd281d0d3a8ee6bd88b45c61722cc9f3b7
Subproject commit 1f6fc3e0580b821fef9d4ec11ed303c7ee6a54b8
CSPP-Template README
ESRBB README
====================
_CSPP-Template.lvproj_ is used to develop an application based on NI ActorFramework and CS++ libraries. Currently used development SW is LabVIEW 2019.
_ESRBB.lvproj_ is used to develop an application based on NI ActorFramework and CS++ libraries. Currently used development SW is LabVIEW 2019.
LONG_DESCRIPTION
This ESRBB.lvproj is used to develop an application based on NI ActorFramework and CS++ libraries for barrier-bucket cavity control.
GSI - Arbeitsnotiz
Nr.: 20181122
Zielformulierung des Teilprojekts Controller-software für ESR-BB
Name: M. Frey
Nach Projektende soll ein Controller von National Instruments die Anlagensteuerung fur beide Kavitäten mittels eines Labview-Programms ("VI") übernehmen.
Diese Software soll möglichst hohe Ausfallsicherheit und damit hohe Anlagenverfügbarkeit sicherstellen.
Die Software soll mit der bereits vorhandenen Hardware getestet sein und kompatibel mit der SPS-Anlagensteuerung sowie dem Beschleuniger-Kontrollsystem sein.
Related documents and information
=================================
=================================-
- README.md
- Release_Notes.md
- EUPL v.1.1 - Lizenz.pdf & EUPL v.1.1 - Lizenz.rtf
......@@ -43,56 +51,18 @@ Optional External Dependencies
- https://decibel.ni.com/content/thread/18301 and
- http://lavag.org/topic/17056-monitoring-actors
Getting started:
=================================
- Install __CSPP_Tools__
- Clone [CSPP_Tools](https://git.gsi.de/EE-LV/CSPP/CSPP_Tools)
- Get submodules:
- `git submodule init`
- `git submodule update`
- _Optionally switch to the most recent branch._
- Mass-compile folder `CSPP_Tools`
- Run `CSPP_Tools\Main-Project\Installer.vi`
- Fork __this__ repository, if not alread done, and rename repository name and path. Refer to repository settings.
- Clone the forked repository to a local folder.
- Switch to the desired branch.
- Get submodules:
- `git submodule init`
- `git submodule update`
- _Optionally switch to the most recent branch._
- Optionally create a hard link to the custom error file(s): (admin permission maybe necessary; use cmd on windows not bash)
- cd <LabVIEW>\user.lib\errors
- mklink /h CSPP_Core-errors.txt Packages\CSPP_Core\CSPP_Core-errors.txt
- Rename `CSPP-Template.lvproj` to `YourProject.lvproj`
- Open `YourProject.lvproj` with LabVIEW
- If Data Logging and Supervisory Control Module is not available
- Remove `CSPP_DSC` stuff from project.
- Remove Packages/DSC... from project
- Remove DSC in contents file
- Remove corresponding entries in ini file.
- Edit shared variable libraries, remove DCS specific properties. (https://git.gsi.de/EE-LV/CSPP/cspp-template/-/issues/1)
- Save and reopen `YourProject.lvproj`
- Run `Rename.vi`
- When all renaming was succefull, remove `Rename.vi` from project and delete from disc.
- Deploy Shared Variable libraries.
- SV.lib/`YourProject.lvlib`
- SV.lib/`CSPP_Core_SV.lvlib` If you want to use BaseActor and or DeviceActor.
- Save `YourProject.lvproj`.
- Run your project specific `YourProject_Main.vi` in order to check if everything is working.
- `chmod a-w -R *` to avoid unintended changes.
Start Implementing YourProject
Start Implementing ESRBB
===================================
- Extend `YourProject.lvproj` to your needs.
- Edit copyright information in description of `YourProject.lvproj` and README.md
- Extend `ESRBB.lvproj` to your needs.
- Edit copyright information in description of `ESRBB.lvproj` and README.md
- Use existing libraries and actors
- Extend the `YourProject.ini` with additiional entries.
- You could also start your own ini-file with `CSPP_Minimum.ini`. You need to rename it to `YourProject.ini` or to specify it in you main.vi or as command-line paramater.
- Extend the `ESRBB.ini` with additiional entries.
- You could also start your own ini-file with `CSPP_Minimum.ini`. You need to rename it to `ESRBB.ini` or to specify it in you main.vi or as command-line paramater.
- Add more submodules
- Template configuration ini-files and Shared Variable libraries should be included in all submodules.
- Add more actors to configuration ini-file by copying from templates and renaming.
- You need to create and deploy your project specific shared variable libraries.
- e.g. copy Shared Variables from `CSPP_Core_SV.lvlib` to `YourProject.lvlib` and rename.
- e.g. copy Shared Variables from `CSPP_Core_SV.lvlib` to `ESRBB.lvlib` and rename.
- Develop your project specific actor classes.
- Provide template configuration ini-files and Shared Variable libraries
- If Data Logging and Supervisory Control Module is available
......@@ -102,9 +72,9 @@ Start Implementing YourProject
Known issues:
=============
Author: name@domain
Author: H.Brand@gsi.de
Copyright 2020 GSI Helmholtzzentrum für Schwerionenforschung GmbH
Copyright 2021 GSI Helmholtzzentrum für Schwerionenforschung GmbH
EEL, Planckstr.1, 64291 Darmstadt, Germany
......
Release Notes for the CSPP-Template Project
Release Notes for the ESRBB Project
===========================================
This LabVIEW project _CSPP-Template.lvproj_ is used to develop the applications based on NI ActorFramework and CS++ libraries.
This LabVIEW project _ESRBB.lvproj_ is used to develop the applications based on NI ActorFramework and CS++ libraries.
Version 0.0.0.0 DD-MM-YYYY name@domain
Version 0.0.0.0 26-04-2021 H.Brand@gsi.de
--------------------------------------
The CSPP-Template project was just forked. There is the master branch with some submodules, only.
The ESRBB project was just forked. There is the master branch with some submodules, only.
File deleted
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