From d497d361727df1cd3761ab24b1d6e2e526257010 Mon Sep 17 00:00:00 2001
From: Gabriel Fedel <gabriel.fedel@esss.se>
Date: Tue, 17 Aug 2021 16:44:47 +0200
Subject: [PATCH] Update for TS2 - System 1 - LLRF 2

---
 README.md |  4 ++--
 env.sh    | 17 ++++++-----------
 st.cmd    |  8 +-------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 475c3a7..b027630 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# e3-ioc-LLRF
+# LLRF IOC
 
-ESS LLRF ioc generic - 1 digitizer - Cold linac
+LLRF IOC for TS2 - System 1 - LLRF 2
 
 ---
diff --git a/env.sh b/env.sh
index f3e946c..0610b14 100644
--- a/env.sh
+++ b/env.sh
@@ -1,25 +1,20 @@
-export IOCNAME="LLRF:Ctrl-IOC-01"
+export IOCNAME="TS2-010RFC:Ctrl-IOC-102"
 
-export EPICS_CA_MAX_ARRAY_BYTES=16777300
-export LLRF_PREFIX="LLRF"
-export LLRF_DIGRTM_PREFIX="LLRF"
+export LLRF_PREFIX="TS2-010RFC:RFS-LLRF-102"
+export LLRF_DIGRTM_PREFIX="TS2-010RFC"
 
-export LLRF_DIG_R_1="DIG1"
-export LLRF_RFM_R_1="RFM1"
+export LLRF_DIG_R_1="RFS-DIG-102"
+export LLRF_RFM_R_1="RFS-RFM-102"
 
 export F_SAMPLING=117.403333333
 export F_SYSTEM=704.42
 export NEARIQN=14
 export NEARIQM=3
 
-export LLRF_SLOT_1=3
+export LLRF_SLOT_1=6
 
 # Move this to llrfsystem with different substitutions?
 export CAVITYCH=0
 export CAVFWDCH=2
 export PWRFWDCH=3
 export TABLE_SMNM_MAX=1000 # Double check this
-
-# Timing
-export EVRPREFIX="LLRF:EVR"
-export EVRSLOT="0e:00.0"
diff --git a/st.cmd b/st.cmd
index 0afca9d..2963edf 100644
--- a/st.cmd
+++ b/st.cmd
@@ -9,17 +9,11 @@ epicsEnvSet("F-SYSTEM" "$(F_SYSTEM)")
 # Load standard module startup scripts
 iocshLoad("$(essioc_DIR)/common_config.iocsh")
 
-# Load timing
-require mrfioc2, 2.3.1-beta.5
-require evrisland
-iocshLoad("$(evrisland_DIR)/island_with_mrfioc.iocsh")
-
 # Load LLRF
 require llrfsystem
 
 epicsEnvSet("RFENDPV", "$(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R_1):PosRFEnd")
-callbackSetQueueSize(10000)
-iocshLoad("$(llrfsystem_DIR)/generic-1-dig.iocsh", "P=$(LLRF_PREFIX)::, R=, PD=$(LLRF_DIGRTM_PREFIX):, RD=$(LLRF_DIG_R_1):, PD1=$(LLRF_DIGRTM_PREFIX):, RD1=$(LLRF_DIG_R_1):, RR=$(LLRF_RFM_R_1):")
+iocshLoad("$(llrfsystem_DIR)/generic-1-dig.iocsh", "P=$(LLRF_PREFIX):, R=, PD=$(LLRF_DIGRTM_PREFIX):, RD=$(LLRF_DIG_R_1):, PD1=$(LLRF_DIGRTM_PREFIX):, RD1=$(LLRF_DIG_R_1):, RR=$(LLRF_RFM_R_1):")
 
 dbl > PVs.list
 ## For commands to be run after iocInit, use the function afterInit()
-- 
GitLab