From 28445ce5866401867d00a9d6bb6fb2049e54e220 Mon Sep 17 00:00:00 2001
From: Jerzy Jamroz <jerzy.jamroz@esss.se>
Date: Wed, 22 Jan 2020 15:50:08 +0100
Subject: [PATCH] Modes - refactoring.
---
init/databuffer-ess.json | 8 ++++----
supercycles/README.md | 4 +++-
supercycles/example01.csv | 2 +-
supercycles/example02.csv | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/init/databuffer-ess.json b/init/databuffer-ess.json
index 0175781..518e725 100644
--- a/init/databuffer-ess.json
+++ b/init/databuffer-ess.json
@@ -1,7 +1,7 @@
{
- "ProtocolNumber": 1,
- "ProtocolVersion": 1,
- "Modes": {
+ "ProtNum": 1,
+ "ProtVer": 1,
+ "PBMod": {
"None": {
"id": 0,
"events": "None",
@@ -119,7 +119,7 @@
"pv": "PBMod"
}
},
- "Destination": {
+ "PBDest": {
"None": {
"id": 0
},
diff --git a/supercycles/README.md b/supercycles/README.md
index 4706dc6..ac49059 100644
--- a/supercycles/README.md
+++ b/supercycles/README.md
@@ -8,5 +8,7 @@ ESS Supercycle Tables
# Design Guide
* Place a supecycle table in this directory.
* Use "libreoffice" or "Microsoft Excel" to create/edit .csv files (comma-separated values).
-* Each table should have a unique name (name).csv.
+* Each table should have a unique name {name}.csv.
* Fist "row" defines keys for each dataset within its collumn (key).
+* The keywords are the same as Data Buffer PVs (PBDest, PBMod, ...) and Event Codes (BPULSE_ST, BPULSE_END, ...).
+* Each row requires a unique Id number (the reference purpose).
diff --git a/supercycles/example01.csv b/supercycles/example01.csv
index ae59194..0815d85 100644
--- a/supercycles/example01.csv
+++ b/supercycles/example01.csv
@@ -1,4 +1,4 @@
-Id,Modes,Destination,EVT_BPULSE_ST,EVT_BPULSE_END
+Id,PBMod,PBDest,BPULSE_ST,BPULSE_END
1,Conditioning,ISrc,0,50
2,Conditioning,LEBT,50,100
3,Conditioning,MEBT,100,150
diff --git a/supercycles/example02.csv b/supercycles/example02.csv
index 3a8b020..b9b6727 100644
--- a/supercycles/example02.csv
+++ b/supercycles/example02.csv
@@ -1,4 +1,4 @@
-Id,Modes,Destination,EVT_BPULSE_ST,EVT_BPULSE_END
+Id,PBMod,PBDest,BPULSE_ST,BPULSE_END
1,Conditioning,ISrc,0,5
2,Conditioning,LEBT,0,50
3,Conditioning,MEBT,0,100
--
GitLab