From 1a713dd63d139e40bdd852253f304b9a51874bfc Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Mon, 2 Sep 2024 19:19:46 +0200 Subject: [PATCH] Remove ECMC_AXISFIELDINIT It is not used --- motion/ecmc_axis_mr.cmd | 6 ++---- motion/ecmc_axis_unset.cmd | 1 - motion/ecmc_virt_axis_unset.cmd | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/motion/ecmc_axis_mr.cmd b/motion/ecmc_axis_mr.cmd index 359e4bf93..0f9da7d1f 100644 --- a/motion/ecmc_axis_mr.cmd +++ b/motion/ecmc_axis_mr.cmd @@ -18,10 +18,8 @@ ecmcEpicsEnvSetCalc("ECMC_TEMP_UREV","if(abs(${ECMC_ENC_SCALE_NUM=0})>0){RESULT: #- Use correct field depending on use of ACCL or ACCS ecmcFileExist(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}.template,1,1) -${ECMC_BLOCK_ACCL} dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}.template, "PREFIX=${ECMC_PREFIX}, MOTOR_NAME=${ECMC_MOTOR_NAME}, MOTOR_PORT=${ECMC_MOTOR_PORT}, AXIS_NO=${ECMC_AXIS_NO}, DESC=${ECMC_DESC}, EGU=${ECMC_EGU}, PREC=${ECMC_PREC}, VELO=${ECMC_VELO}, JVEL=${ECMC_JOG_VEL}, JAR=${ECMC_JAR}, ACCL=${ECMC_ACCL=0}, RDBD=${ECMC_MON_AT_TARGET_TOL}, DLLM=${ECMC_SOFT_LOW_LIM}, DHLM=${ECMC_SOFT_HIGH_LIM}, HOMEPROC=${ECMC_HOME_PROC},SREV=${ECMC_TEMP_SREV},UREV=${ECMC_TEMP_UREV}, ${ECMC_AXISFIELDINIT=""}, ECMC_BLOCK_ARCHIVER=${ECMC_BLOCK_ARCHIVER=#}, ECMC_ARCHIVER_POLICY=${ECMC_ARCHIVER_POLICY=}, ECMC_ARCHIVER_CLUSTER=${ECMC_ARCHIVER_CLUSTER=}") -${ECMC_BLOCK_ACCS} dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}.template, "PREFIX=${ECMC_PREFIX}, MOTOR_NAME=${ECMC_MOTOR_NAME}, MOTOR_PORT=${ECMC_MOTOR_PORT}, AXIS_NO=${ECMC_AXIS_NO}, DESC=${ECMC_DESC}, EGU=${ECMC_EGU}, PREC=${ECMC_PREC}, VELO=${ECMC_VELO}, JVEL=${ECMC_JOG_VEL}, JAR=${ECMC_JAR}, ACCS=${ECMC_ACCS_EGU_PER_S2=0}, RDBD=${ECMC_MON_AT_TARGET_TOL}, DLLM=${ECMC_SOFT_LOW_LIM}, DHLM=${ECMC_SOFT_HIGH_LIM}, HOMEPROC=${ECMC_HOME_PROC},SREV=${ECMC_TEMP_SREV},UREV=${ECMC_TEMP_UREV}, ${ECMC_AXISFIELDINIT=""}, ECMC_BLOCK_ARCHIVER=${ECMC_BLOCK_ARCHIVER=#}, ECMC_ARCHIVER_POLICY=${ECMC_ARCHIVER_POLICY=}, ECMC_ARCHIVER_CLUSTER=${ECMC_ARCHIVER_CLUSTER=}") - -epicsEnvSet("ECMC_AXISFIELDINIT", "") +${ECMC_BLOCK_ACCL} dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}.template, "PREFIX=${ECMC_PREFIX}, MOTOR_NAME=${ECMC_MOTOR_NAME}, MOTOR_PORT=${ECMC_MOTOR_PORT}, AXIS_NO=${ECMC_AXIS_NO}, DESC=${ECMC_DESC}, EGU=${ECMC_EGU}, PREC=${ECMC_PREC}, VELO=${ECMC_VELO}, JVEL=${ECMC_JOG_VEL}, JAR=${ECMC_JAR}, ACCL=${ECMC_ACCL=0}, RDBD=${ECMC_MON_AT_TARGET_TOL}, DLLM=${ECMC_SOFT_LOW_LIM}, DHLM=${ECMC_SOFT_HIGH_LIM}, HOMEPROC=${ECMC_HOME_PROC},SREV=${ECMC_TEMP_SREV},UREV=${ECMC_TEMP_UREV}, ECMC_BLOCK_ARCHIVER=${ECMC_BLOCK_ARCHIVER=#}, ECMC_ARCHIVER_POLICY=${ECMC_ARCHIVER_POLICY=}, ECMC_ARCHIVER_CLUSTER=${ECMC_ARCHIVER_CLUSTER=}") +${ECMC_BLOCK_ACCS} dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}.template, "PREFIX=${ECMC_PREFIX}, MOTOR_NAME=${ECMC_MOTOR_NAME}, MOTOR_PORT=${ECMC_MOTOR_PORT}, AXIS_NO=${ECMC_AXIS_NO}, DESC=${ECMC_DESC}, EGU=${ECMC_EGU}, PREC=${ECMC_PREC}, VELO=${ECMC_VELO}, JVEL=${ECMC_JOG_VEL}, JAR=${ECMC_JAR}, ACCS=${ECMC_ACCS_EGU_PER_S2=0}, RDBD=${ECMC_MON_AT_TARGET_TOL}, DLLM=${ECMC_SOFT_LOW_LIM}, DHLM=${ECMC_SOFT_HIGH_LIM}, HOMEPROC=${ECMC_HOME_PROC},SREV=${ECMC_TEMP_SREV},UREV=${ECMC_TEMP_UREV}, ECMC_BLOCK_ARCHIVER=${ECMC_BLOCK_ARCHIVER=#}, ECMC_ARCHIVER_POLICY=${ECMC_ARCHIVER_POLICY=}, ECMC_ARCHIVER_CLUSTER=${ECMC_ARCHIVER_CLUSTER=}") ecmcFileExist(${ECMC_MR_MODULE="ecmcMotorRecord"}home.template,1,1) dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord"}home.template, "PREFIX=${ECMC_PREFIX}, MOTOR_NAME=${ECMC_MOTOR_NAME}, MOTOR_PORT=${ECMC_MOTOR_PORT}, AXIS_NO=${ECMC_AXIS_NO},HOMEPROC=${ECMC_HOME_PROC}, HOMEPOS=${ECMC_HOME_POS}, HVELTO=${ECMC_HOME_VEL_TO}, HVELFRM=${ECMC_HOME_VEL_FRM}, HOMEACC=${ECMC_HOME_ACC}") diff --git a/motion/ecmc_axis_unset.cmd b/motion/ecmc_axis_unset.cmd index 6e464fb89..fa30dbc9c 100644 --- a/motion/ecmc_axis_unset.cmd +++ b/motion/ecmc_axis_unset.cmd @@ -8,7 +8,6 @@ #- epicsEnvUnset(ECMC_AXIS_NO) epicsEnvUnset(ECMC_AXISCONFIG) -epicsEnvUnset(ECMC_AXISFIELDINIT) epicsEnvUnset(ECMC_PREC) epicsEnvUnset(ECMC_EGU) epicsEnvUnset(ECMC_DESC) diff --git a/motion/ecmc_virt_axis_unset.cmd b/motion/ecmc_virt_axis_unset.cmd index 8d0b39c33..5d2bd6c7b 100644 --- a/motion/ecmc_virt_axis_unset.cmd +++ b/motion/ecmc_virt_axis_unset.cmd @@ -8,7 +8,6 @@ #- epicsEnvUnset(ECMC_AXIS_NO) epicsEnvUnset(ECMC_AXISCONFIG) -epicsEnvUnset(ECMC_AXISFIELDINIT) epicsEnvUnset(ECMC_PREC) epicsEnvUnset(ECMC_EGU) epicsEnvUnset(ECMC_DESC)