From a31df8de162fc5c86e2cc1d9b83867e167ddda03 Mon Sep 17 00:00:00 2001
From: Gabriel Fedel <gabriel.fedel@esss.se>
Date: Tue, 22 Jun 2021 09:59:13 +0200
Subject: [PATCH] Fix prefix and include evr island

---
 env.sh | 8 ++++++--
 st.cmd | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/env.sh b/env.sh
index be9600f..f3e946c 100644
--- a/env.sh
+++ b/env.sh
@@ -4,8 +4,8 @@ export EPICS_CA_MAX_ARRAY_BYTES=16777300
 export LLRF_PREFIX="LLRF"
 export LLRF_DIGRTM_PREFIX="LLRF"
 
-export LLRF_DIG_R_1="DIG"
-export LLRF_RFM_R_1="RFM"
+export LLRF_DIG_R_1="DIG1"
+export LLRF_RFM_R_1="RFM1"
 
 export F_SAMPLING=117.403333333
 export F_SYSTEM=704.42
@@ -19,3 +19,7 @@ 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 3438bdf..36c8d75 100644
--- a/st.cmd
+++ b/st.cmd
@@ -4,6 +4,11 @@ epicsEnvSet("TOP",      "$(E3_CMD_TOP)")
 epicsEnvSet("F-SAMPLING" "$(F_SAMPLING)")
 epicsEnvSet("F-SYSTEM" "$(F_SYSTEM)")
 
+# Load timing
+require mrfioc2, 2.2.1rc3
+require evrisland
+iocshLoad("$(evrisland_DIR)/island_with_mrfioc.iocsh")
+
 # Load LLRF
 require llrfsystem
 
-- 
GitLab