Default to next PLUGIN_ID if not defined

Merge branch 'master' of git.psi.ch:motion/ecmc_plugin_daq into new_plg_concept
depend on ecmc 9.6
2025-03-03 14:57:52 +01:00 · 2025-03-03 14:38:16 +01:00 · 2024-09-13 09:31:51 +02:00 · 2024-09-13 09:07:12 +02:00
2 changed files with 9 additions and 4 deletions
--- a/4
+++ b/4
@@ -9,7 +9,7 @@ BUILDCLASSES = Linux
 ARCH_FILTER = deb10%

 # Run 7.0.6 for now
-EXCLUDE_VERSIONS+=3 7.0.5 7.0.6
+EXCLUDE_VERSIONS+=3 7.0.5 7.0.6 7.0.7

 IGNORE_MODULES += asynMotor
 IGNORE_MODULES += motorBase
@@ -19,7 +19,7 @@ OPT_CXXFLAGS_YES = -O3

 # dependencies
 ECmasterECMC_VERSION = v1.1.0
-ecmc_VERSION = v10.0.0_RC1
+ecmc_VERSION = 10.0

 BASE_DIR = .
 SRC_DIR = $(BASE_DIR)/src
--- a/startup.cmd
+++ b/startup.cmd
@@ -10,10 +10,15 @@
 #-###############################################################################
 #-
 #- Arguments
-#- PLUGIN_ID : Id of plugin to load (mandatory)
+#- PLUGIN_ID : Id of plugin to load (optional)
 #-
 #################################################################################

 #- Load plugin:
+
 epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_daq_DIR)lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmc_plugin_daq.so")
-${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID}, FILE='${ECMC_PLUGIN_FILNAME}' , CONFIG='NOT USED',REPORT=1"
+ecmcIf("${PLUGIN_ID=-1}=-1")
+${IF_TRUE}${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "FILE='${ECMC_PLUGIN_FILNAME}' , CONFIG='NOT USED',REPORT=1"
+#else
+${IF_FALSE}${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID}, FILE='${ECMC_PLUGIN_FILNAME}' , CONFIG='NOT USED',REPORT=1"
+ecmcEndIf()
Author	SHA1	Message	Date
Anders Sandström	bdfc2ff3cc	Default to next PLUGIN_ID if not defined	2025-03-03 14:57:52 +01:00
Anders Sandström	411a083a77	Merge branch 'master' of git.psi.ch:motion/ecmc_plugin_daq into new_plg_concept	2025-03-03 14:38:16 +01:00
Anders Sandström	7b35cb0f5c	depend on ecmc 9.6	2024-09-13 09:31:51 +02:00
Anders Sandström	867c9f6a06	Depend on ecmc 9	2024-09-13 09:07:12 +02:00