From 7aec593617fd27ce864645bea6361d8cae9d8f44 Mon Sep 17 00:00:00 2001 From: Gabriel Fedel <gabriel.fedel@esss.se> Date: Mon, 23 Aug 2021 11:54:59 +0200 Subject: [PATCH] Changes to allow use of set Main Digitizer --- env.sh | 1 + st.cmd | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/env.sh b/env.sh index b7b0571..3765daf 100644 --- a/env.sh +++ b/env.sh @@ -2,6 +2,7 @@ export IOCNAME="TS2-010RFC:Ctrl-IOC-002" export IOCDIR="TS2-010RFC_Ctrl-IOC-002" export AS_TOP="/opt/nonvolatile" export IOCNAME_SLUG="TS2-010RFC_Ctrl-IOC-002" +export SIS8300LLRF_VER=dev_ts2 export LLRF_PREFIX="TS2-010RFC:RFS-LLRF-102" export LLRF_DIGRTM_PREFIX="TS2-010RFC" diff --git a/st.cmd b/st.cmd index 2963edf..fdd8b05 100644 --- a/st.cmd +++ b/st.cmd @@ -10,10 +10,10 @@ epicsEnvSet("F-SYSTEM" "$(F_SYSTEM)") iocshLoad("$(essioc_DIR)/common_config.iocsh") # Load LLRF -require llrfsystem +require llrfsystem, dev_ts2 epicsEnvSet("RFENDPV", "$(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R_1):PosRFEnd") -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)/ts2-sec.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