Merge branch 'ICSHWI-13440' into 'master'

Makes evrisland compatible with evr template

Closes ICSHWI-13440

See merge request !22

CHANGELOG.md

+# 2.0.0+0
+* Change evrisland snippet to be loaded with mrfioc2 from a generic
+evr template (ICSHWI-13440)
+
 # 1.10.1+0
 * Fix how the initial waveform are set (labels and sequencer)
 

configure/CONFIG_MODULE

 EPICS_MODULE_NAME:=evrisland
-E3_MODULE_VERSION:=1.10.1+0
+E3_MODULE_VERSION:=2.0.0+0
 
 BUSY_DEP_VERSION:=1.7.3+2
 IOCMETADATA_DEP_VERSION:=0.1.0+1
-MRFIOC2_DEP_VERSION:=2.3.1+7
+MRFIOC2_DEP_VERSION:=2.3.1+8
 
 E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
 E3_MODULE_SRC_PATH:=evrisland

iocsh/evrisland-base.iocsh

-epicsEnvSet("PREFIX", "$(EVRPREFIX)")
-epicsEnvSet("OBJ", "EVR")
-epicsEnvSet("PCI_SLOT", "$(EVRSLOT)")
-
 ## This shouldn't be loaded if the mrfioc2 is already running
-$(MRFIOC=)iocshLoad "$(mrfioc2_DIR)/evr.iocsh" "P=$(PREFIX), PCIID=$(PCI_SLOT), $(INITARGS=), EVRDB=$(EVRDB=evr-mtca-300-univ.db)"
-dbLoadRecords("evr-databuffer-ess.db",     "P=$(PREFIX)")
+dbLoadRecords("evr-databuffer-ess.db",     "P=$(P)")
 # Load list of events
 iocshLoad("$(evrisland_DIR)/events.iocsh")
-# - Load EVR Island application
-dbLoadRecords("evrisland.template", "P=$(PREFIX):, EVRPREFIX=$(PREFIX):, F14Hz=$(F14Hz), RFSt=$(RFSt), BPulseSt=$(BPulseSt), BPulseEnd=$(BPulseEnd), Island_event=$(Island_event), F0Hz5=$(F0Hz5), F1Hz=$(F1Hz), F2Hz=$(F2Hz), F3Hz5=$(F3Hz5), F7Hz=$(F7Hz), HVSYNCWDT=$(HVSYNCWDT=100), RFSYNCDLY=$(RFSYNCDLY=1000), MEBTEN=$(MEBTEN=0)")
 
-# Create island event for local mode
-dbLoadRecords("evrevent.db","EN=$(PREFIX)-$(Island_event), OBJ=$(OBJ), CODE=$(Island_event), EVNT=$(Island_event)")
+# - Load EVR Island application
+dbLoadRecords("evrisland.template", "P=$(P):, EVRPREFIX=$(P):, F14Hz=$(F14Hz), RFSt=$(RFSt), BPulseSt=$(BPulseSt), BPulseEnd=$(BPulseEnd), Island_event=$(Island_event), F0Hz5=$(F0Hz5), F1Hz=$(F1Hz), F2Hz=$(F2Hz), F3Hz5=$(F3Hz5), F7Hz=$(F7Hz), HVSYNCWDT=$(HVSYNCWDT=100), RFSYNCDLY=$(RFSYNCDLY=1000), MEBTEN=$(MEBTEN=0)")
 
 # Load initial values
-dbLoadRecords("initial-values.db",     "P=$(PREFIX),Island_event=$(Island_event),F14Hz=$(F14Hz)")
+dbLoadRecords("initial-values.db",     "P=$(P),Island_event=$(Island_event),F14Hz=$(F14Hz)")
 
 # Record to start sequencer
-dbLoadRecords("start-sequencer.template",     "P=$(PREFIX)")
-
-## This shouldn't be loaded if the mrfioc2 is already running
-# Load default configuration from timing
-$(MRFIOC=)afterInit('iocshLoad($(mrfioc2_DIR)/evr.r.iocsh                   "P=$(PREFIX), INTREF=$(INTREF=#)")')
-$(MRFIOC=)afterInit('iocshLoad($(mrfioc2_DIR)/evrtclk.r.iocsh               "P=$(PREFIX)")')
+dbLoadRecords("start-sequencer.template",     "P=$(P)")
 
 # Create set of values for evrisland
 afterInit("makeAutosaveFileFromDbInfo('$(AS_TOP)/$(IOCDIR)/req/values_pass2.req','autosaveFields_pass2')")
@@ -32,4 +20,4 @@ afterInit("create_monitor_set("values_pass2.req",5)")
 afterInit("fdbrestore("$(AS_TOP)/$(IOCDIR)/save/values_pass2.sav")")
 
 # Generate list of PVs to archive
-pvlistFromInfo("ARCHIVE_THIS", "$(PREFIX):ArchiverList")
+pvlistFromInfo("ARCHIVE_THIS", "$(P):ArchiverList")