3 Commits
2.0.0 ... 2.0.2

Author SHA1 Message Date
104875d532 Fix makefile for deb12 2025-03-21 10:47:05 +01:00
69fcd4da36 Default to PLUGIN_ID=0 2025-03-03 15:17:46 +01:00
653d4aac02 Default to PLUGIN_ID=0 2025-03-03 15:17:18 +01:00
3 changed files with 19 additions and 15 deletions

View File

@@ -5,10 +5,10 @@ MODULE = ecmc_plugin_motion
USR_CFLAGS +=-DECMC_PLUGIN_MODULE_NAME=${MODULE} USR_CFLAGS +=-DECMC_PLUGIN_MODULE_NAME=${MODULE}
BUILDCLASSES = Linux BUILDCLASSES = Linux
ARCH_FILTER = deb10% ARCH_FILTER = deb10% deb12%
# Run 7.0.6 for now # Run 7.0.6 for now
EXCLUDE_VERSIONS+=3 7.0.5 7.0.6 7.0.7 EXCLUDE_VERSIONS+=3 7.0.5 7.0.6 7.0.7 7.0.9
IGNORE_MODULES += asynMotor IGNORE_MODULES += asynMotor
IGNORE_MODULES += motorBase IGNORE_MODULES += motorBase
@@ -20,15 +20,21 @@ OPT_CXXFLAGS_YES = -O3
ECmasterECMC_VERSION = v1.1.0 ECmasterECMC_VERSION = v1.1.0
ecmc_VERSION = 10.0 ecmc_VERSION = 10.0
################################################################################ # ethercat
# THIS RELATES TO THE EtherCAT MASTER LIBRARY EC_BASE_PATH = /ioc/NeedfulThings/EtherCAT/4epics/
# IT IS OF PARAMOUNT IMPORTANCE TO LOAD THE PROPER KERNEL MODULE USR_CXXFLAGS_deb12-x86_64 += -I${EC_BASE_PATH}${T_A}/include/
# ################################################################################ USR_CXXFLAGS_deb12-x86_64 += -L${EC_BASE_PATH}${T_A}/lib/
USR_LDFLAGS += -lethercat
OPT_CXXFLAGS_YES = -O3
LIB_SYS_LIBS += ethercat
USR_LDFLAGS_deb12-x86_64 += -Wl,-rpath=${EC_BASE_PATH}${T_A}/lib/
USR_LDFLAGS_deb12-x86_64 += -L ${EC_BASE_PATH}${T_A}/lib/
USR_LDFLAGS_deb10-x86_64 += -lethercat
EC_MASTER_LIB = ${EPICS_MODULES}/ECmasterECMC/${ECmasterECMC_VERSION}/R${EPICSVERSION}/lib/${T_A} EC_MASTER_LIB = ${EPICS_MODULES}/ECmasterECMC/${ECmasterECMC_VERSION}/R${EPICSVERSION}/lib/${T_A}
USR_LDFLAGS += -Wl,-rpath=${EC_MASTER_LIB} USR_LDFLAGS_deb10-x86_64 += -Wl,-rpath=${EC_MASTER_LIB}
USR_LDFLAGS += -L ${EC_MASTER_LIB} USR_LDFLAGS_deb10-x86_64 += -L ${EC_MASTER_LIB}
BASE_DIR = . BASE_DIR = .
SRC_DIR = $(BASE_DIR)/src SRC_DIR = $(BASE_DIR)/src

View File

@@ -31,7 +31,7 @@ epicsEnvSet(ECMC_PLG_MOTION_OBJ_INDEX,${ECMC_PLG_MOTION_OBJ_INDEX=0})
# Might need differet paths for PSI and ESS.. must check # Might need differet paths for PSI and ESS.. must check
epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_motion_DIR)/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmc_plugin_motion.so") epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_motion_DIR)/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmc_plugin_motion.so")
epicsEnvSet(ECMC_PLUGIN_CONFIG,"AXIS=${AX};BUFFER_SIZE=${BUFF_SIZE};DBG_PRINT=${DBG=1};ENABLE=${ENA=1};") 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}" ${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID=0},FILE=${ECMC_PLUGIN_FILNAME},CONFIG='${ECMC_PLUGIN_CONFIG}', REPORT=${REPORT=1}"
dbLoadRecords(${ecmc_plugin_motion_TEMPLATES}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}")

View File

@@ -10,10 +10,8 @@
#-############################################################################### #-###############################################################################
#- #-
#- Arguments #- Arguments
#- [mandatory]
#- PLUGIN_ID = Plugin instansiation index, must be unique for each call
#-
#- [optional] #- [optional]
#- PLUGIN_ID = Plugin instansiation index, must be unique for each call defaults to 0
#- AX = Axis id, default 1 #- AX = Axis id, default 1
#- BUFF_SIZE = Buffer size, default 1000 #- BUFF_SIZE = Buffer size, default 1000
#- DBG = Debug mode, default 1 #- DBG = Debug mode, default 1
@@ -27,6 +25,6 @@
# Only allow call startup.cmd once. if more objects are needed then use addMotionObj.cmd directlly. # Only allow call startup.cmd once. if more objects are needed then use addMotionObj.cmd directlly.
#- add One motion plugin object, only run startup once #- add One motion plugin object, only run startup once
${ECMC_PLG_MOTION_INIT=""}${SCRIPTEXEC} $(ecmc_plugin_motion_DIR)addMotionObj.cmd "PLUGIN_ID=${PLUGIN_ID},AX=${AX=1},BUFF_SIZE=${BUFF_SIZE=1000},DBG=${DBG=1},ENA=${ENA=1},REPORT=${REPORT=1}" ${ECMC_PLG_MOTION_INIT=""}${SCRIPTEXEC} $(ecmc_plugin_motion_DIR)addMotionObj.cmd "PLUGIN_ID=${PLUGIN_ID=0},AX=${AX=1},BUFF_SIZE=${BUFF_SIZE=1000},DBG=${DBG=1},ENA=${ENA=1},REPORT=${REPORT=1}"
epicsEnvSet("ECMC_PLG_MOTION_INIT" ,"#") epicsEnvSet("ECMC_PLG_MOTION_INIT" ,"#")