From 8dbda6fc7c75387dacf68cafd5848a46f38251f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= <anders.sandstroem@psi.ch>
Date: Mon, 14 Aug 2023 15:43:41 +0200
Subject: [PATCH] PSI test ioc works

---
 GNUmakefile                         | 2 +-
 ecmc_plugin_motion/addMotionObj.cmd | 3 ++-
 iocsh/test_plugin_motion_psi.script | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 75f9ef3..0425d2a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,7 +31,7 @@ USR_LDFLAGS +=         -L ${EC_MASTER_LIB}
 
 BASE_DIR = ecmc_plugin_motion
 SRC_DIR = $(BASE_DIR)/src
-DB_DIR =  $(BASE_DIR)/db
+DB_DIR =  $(BASE_DIR)/Db
 
 SOURCES += $(SRC_DIR)/ecmcPluginMotion.c
 SOURCES += $(SRC_DIR)/ecmcMotionPlgWrap.cpp
diff --git a/ecmc_plugin_motion/addMotionObj.cmd b/ecmc_plugin_motion/addMotionObj.cmd
index de40ae9..956d416 100644
--- a/ecmc_plugin_motion/addMotionObj.cmd
+++ b/ecmc_plugin_motion/addMotionObj.cmd
@@ -33,7 +33,8 @@ epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_motion_DIR)/lib/${EPICS_HOST_ARCH
 epicsEnvSet(ECMC_PLUGIN_CONFIG,"AXIS=${AX};BUFFER_SIZE=${BUFF_SIZE};DBG_PRINT=${DBG=1};ENABLE=${ENA=1};")
 ${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID},FILE=${ECMC_PLUGIN_FILNAME},CONFIG='${ECMC_PLUGIN_CONFIG}', REPORT=${REPORT=1}"
 
-dbLoadRecords(ecmcPluginMotion.template,"P=$(IOC):,INDEX=${ECMC_PLG_MOTION_OBJ_INDEX=0},NELM=${BUFF_SIZE=1000}")
+dbLoadRecords(${ecmc_plugin_motion_TEMPLATES}ecmcPluginMotion.template,"P=$(IOC):,INDEX=${ECMC_PLG_MOTION_OBJ_INDEX=0},NELM=${BUFF_SIZE=1000}")
 
 #- Increase of index (need to keep track in order to load correct db)
 ecmcEpicsEnvSetCalc("ECMC_PLG_MOTION_OBJ_INDEX" ,${ECMC_PLG_MOTION_OBJ_INDEX=0}+1)
+
diff --git a/iocsh/test_plugin_motion_psi.script b/iocsh/test_plugin_motion_psi.script
index 33e0f79..b494761 100644
--- a/iocsh/test_plugin_motion_psi.script
+++ b/iocsh/test_plugin_motion_psi.script
@@ -29,7 +29,7 @@ $(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/el7031.ax)
 ## Load plugin: MOTION
 #
 epicsEnvSet(ECMC_PLUGIN_CONFIG,"PLUGIN_ID=1,AX=1,BUFF_SIZE=200,DBG=0,ENA=1")
-require ecmc_plugin_motion sandst_a ${ECMC_PLUGIN_CONFIG}
+require ecmc_plugin_motion sandst_a "${ECMC_PLUGIN_CONFIG}"
 # below needed at ESS but not PSI:
 #${SCRIPTEXEC} ${ecmc_plugin_motion_DIR}startup.cmd "${ECMC_PLUGIN_CONFIG}"