From dae115c071145392a0654a71ef61f8b055919d20 Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Tue, 26 Jun 2018 13:32:55 +0200 Subject: [PATCH] HAMEG: Define channels in st.cmd not via .substitutions Gives more flexibility to use the IOC also for devices with more or less channels than three. Also allows to restrict EPICS access to certain channels of the device. This change has to be verified and is currently untested. --- ..._HMP4030_CHANNEL.template => HAMEG_HMP4030_CHANNEL.db} | 0 .../Db/HAMEG_HMP4030_CHANNEL.substitutions | 8 -------- HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-) rename HAMEG_HMP4030/HAMEG_HMP4030App/Db/{HAMEG_HMP4030_CHANNEL.template => HAMEG_HMP4030_CHANNEL.db} (100%) delete mode 100644 HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.substitutions diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db similarity index 100% rename from HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.template rename to HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.substitutions b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.substitutions deleted file mode 100644 index a15b080..0000000 --- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.substitutions +++ /dev/null @@ -1,8 +0,0 @@ -file HAMEG_HMP_CHANNEL.template { - -pattern { CHAN_NAME, CHAN } - { "CHAN1", 1 } - { "CHAN2", 2 } - { "CHAN3", 3 } -} - diff --git a/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd b/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd index 558b6e1..e007af2 100755 --- a/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd +++ b/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd @@ -24,7 +24,9 @@ asynSetOption ("HAMEG_PORT", 0, "crtscts", "N") #dbLoadRecords("db/xxx.db","user=scs") dbLoadRecords("db/HAMEG_HMP4030.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT") -dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT") +dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN1,CHAN=1") +dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN2,CHAN=2") +dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN3,CHAN=3") cd "${TOP}/iocBoot/${IOC}" iocInit -- 2.43.0