Merge branch 'master' of git.psi.ch:epics_ioc_modules/ecmc_plugin_safety

GNUmakefile

@@ -41,5 +41,5 @@ SOURCES += $(SRC_DIR)/ecmcSS1SafetyGroup.cpp
 #SOURCES += $(foreach d,${SRC_DIR}, $(wildcard $d/*.c) $(wildcard $d/*.cpp))
 HEADERS += $(foreach d,${SRC_DIR}, $(wildcard $d/*.h))
 DBDS += $(foreach d,${SRC_DIR}, $(wildcard $d/*.dbd))
-SCRIPTS += $(BASE_DIR)/scripts/startup.cmd
+SCRIPTS += $(BASE_DIR)/startup.cmd
 TEMPLATES += $(wildcard $(DB_DIR)/*.template)

iocsh/el7042-0052.script

@@ -36,9 +36,7 @@ ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}loadYamlAxis.cmd, "FILE=./cfg/axis.yaml,LIMIT=1
 ##############################################################################
 ## Load safety plugin
 #
-#- PLUGIN_ID             = Plugin instansiation index, must be unique for each call
-
-require ecmc_plugin_safety sandst_a "PLUGIN_ID=0"
+require ecmc_plugin_safety sandst_a
 
 ecmcAddSS1SafetyGroup("first","ec${ECMC_EC_MASTER_ID}.s${DRV_SLAVE}.ZERO.0","ec${ECMC_EC_MASTER_ID}.s${DRV_SLAVE}.ZERO.1",500)
 ecmcAddAxisToSafetyGroup("first",1,1,0)