Fixing settings

env.sh

-export IOCNAME=" TS2-LLRF1:Ctrl-IOC-01"
-export AS_TOP=/opt/nonvolatile
-export LOG_SERVER_NAME=172.30.4.43
-export SIS8300LLRF_VER=5.0.7-1
+export IOCNAME="LLRF:Ctrl-IOC-01"
 
 export EPICS_CA_MAX_ARRAY_BYTES=16777300
-export LLRF_PREFIX="TS2-LLRF1"
-export LLRF_DIGRTM_PREFIX="TS2-010"
+export LLRF_PREFIX="LLRF"
+export LLRF_DIGRTM_PREFIX="LLRF"
 
-export LLRF_DIG_R_1="RFS-DIG-101"
-export LLRF_DIG_R_2="RFS-DIG-102"
-
-export LLRF_RFM_R_1="RFS-RFM-101"
-export LLRF_RFM_R_2="RFS-RFM-102"
+export LLRF_DIG_R_1="DIG"
+export LLRF_RFM_R_1="RFM"
 
 export F_SAMPLING=117.403333333
 export F_SYSTEM=704.42
 export NEARIQN=14
 export NEARIQM=3
 
-export LLRF_SLOT_1=4
-export LLRF_SLOT_2=6
+export LLRF_SLOT_1=3
 
 # Move this to llrfsystem with different substitutions?
 export CAVITYCH=0
 export CAVFWDCH=2
-export CAVITYCH1=0
-export CAVFWDCH1=2
-export CAVITYCH2=0
-export CAVFWDCH2=2
 export PWRFWDCH=3
 export TABLE_SMNM_MAX=1000 # Double check this

st.cmd

-require common
-
 epicsEnvSet("ENGINEER", "Gabriel Fedel <gabriel.fedel@ess.eu>")
 ## Add extra environment variables here
 epicsEnvSet("TOP",      "$(E3_CMD_TOP)")
 epicsEnvSet("F-SAMPLING" "$(F_SAMPLING)")
 epicsEnvSet("F-SYSTEM" "$(F_SYSTEM)")
 
-# Load standard module startup scripts
-iocshLoad("$(common_DIR)/e3-common.iocsh")
-
 # Load LLRF
-require llrfsystem, 3.1.0
+require llrfsystem
 
 epicsEnvSet("RFENDPV", "$(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R_1):PosRFEnd")
 callbackSetQueueSize(10000)
-iocshLoad("$(llrfsystem_DIR)/ts2.iocsh", "P=$(LLRF_PREFIX)::, R=, PD=$(LLRF_DIGRTM_PREFIX):, RD=$(LLRF_DIG_R_1):, PD1=$(LLRF_DIGRTM_PREFIX):, RD1=$(LLRF_DIG_R_1):, PD2=$(LLRF_DIGRTM_PREFIX):, RD2=$(LLRF_DIG_R_2):, 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()
@@ -23,4 +18,3 @@ afterInit("system $(E3_IOCSH_TOP)/override_rflps_on_llrf.sh")
 # Call iocInit to start the IOC
 iocInit()
 date
-dbgrep REQMOD* > '/iocs/sis8300llrf/REQMODs.list'