From 5932400d15fd08e4dadafe38f831659227350fe0 Mon Sep 17 00:00:00 2001
From: Gabriel Fedel <gabriel.fedel@ess.eu>
Date: Mon, 25 Apr 2022 11:42:49 +0200
Subject: [PATCH] Change for new sniptes
---
env.sh | 29 -----------------------------
ioc.yml | 2 +-
st.cmd | 24 +++---------------------
3 files changed, 4 insertions(+), 51 deletions(-)
delete mode 100644 env.sh
diff --git a/env.sh b/env.sh
deleted file mode 100644
index 50a580a..0000000
--- a/env.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-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 LLRF_PREFIX="TS2-010RFC:RFS-LLRF-102"
-export LLRF_DIGRTM_PREFIX="TS2-010RFC"
-
-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=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
-
-export EPICS_CA_ADDR_LIST="172.16.111.255"
-export EPICS_CA_AUTO_ADDR_LIST=NO
-
-export LOG_SERVER_NAME=172.30.4.43
-
diff --git a/ioc.yml b/ioc.yml
index 3a98f61..0355793 100644
--- a/ioc.yml
+++ b/ioc.yml
@@ -3,4 +3,4 @@ epics_version: 7.0.5
require_version: 3.4.1
packages: [boost, OpenIPMI, ipmitool, gsl]
realtime: false
-address_list: []
+address_list: [172.16.111.255]
diff --git a/st.cmd b/st.cmd
index 1a86195..656b85e 100644
--- a/st.cmd
+++ b/st.cmd
@@ -1,32 +1,15 @@
-epicsEnvSet("IOCNAME", "TS2-010RFC:Ctrl-IOC-002")
-epicsEnvSet("IOCDIR", "TS2-010RFC_Ctrl-IOC-002")
-epicsEnvSet("AS_TOP", "/opt/nonvolatile")
-epicsEnvSet("IOCNAME_SLUG", "TS2-010RFC_Ctrl-IOC-002")
epicsEnvSet("LLRF_PREFIX", "TS2-010RFC:RFS-LLRF-102")
epicsEnvSet("LLRF_DIGRTM_PREFIX", "TS2-010RFC")
epicsEnvSet("LLRF_DIG_R_1", "RFS-DIG-102")
epicsEnvSet("LLRF_RFM_R_1", "RFS-RFM-102")
-epicsEnvSet("F_SAMPLING", "117.403333333")
-epicsEnvSet("F_SYSTEM", "704.42")
-epicsEnvSet("NEARIQN", "14")
-epicsEnvSet("NEARIQM", "3")
-epicsEnvSet("LLRF_SLOT_1", "6")
-epicsEnvSet("CAVITYCH", "0")
-epicsEnvSet("CAVFWDCH", "2")
-epicsEnvSet("PWRFWDCH", "3")
-epicsEnvSet("TABLE_SMNM_MAX", "1000 # Double check this")
-epicsEnvSet("EPICS_CA_ADDR_LIST", "172.16.111.255")
-epicsEnvSet("EPICS_CA_AUTO_ADDR_LIST", "NO")
-epicsEnvSet("LOG_SERVER_NAME", "172.30.4.43")
+epicsEnvSet("TSELPV" "TS2-010:Ctrl-EVR-101:EvtACnt-I.TIME")
+epicsEnvSet("SEC", "ts2sec")
require essioc
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)")
-epicsEnvSet("TSELPV" "TS2-010:Ctrl-EVR-101:EvtACnt-I.TIME")
# Load standard module startup scripts
iocshLoad("$(essioc_DIR)/common_config.iocsh")
@@ -34,8 +17,7 @@ iocshLoad("$(essioc_DIR)/common_config.iocsh")
# Load LLRF
require llrfsystem
-epicsEnvSet("RFENDPV", "$(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R_1):PosRFEnd")
-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):")
+iocshLoad("$(llrfsystem_DIR)/llrfsystem.iocsh"")
## For commands to be run after iocInit, use the function afterInit()
--
GitLab