diff --git a/env.sh b/env.sh index be9600f43dfd828d18e83fb6184ee161843d15d1..f3e946c45b38fa11befdc30130033cd5c34a6fab 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 3438bdf3519f2490562bad5d21a45bfec55856e3..36c8d7585d60907893b128066e082c9e6793e241 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