From c40bbfc491f3df2bafc92cb143b4a1a0f6d56070 Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Wed, 27 Sep 2023 15:11:06 +0200 Subject: [PATCH 1/2] Remove ECMC_MRES from ecmc_virt_axis_unset.cmd + fix minor typo --- motion/ecmc_axis.cmd | 2 +- motion/ecmc_virt_axis.cmd | 2 +- motion/ecmc_virt_axis_unset.cmd | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/motion/ecmc_axis.cmd b/motion/ecmc_axis.cmd index 836d9a76f..a42e78e23 100644 --- a/motion/ecmc_axis.cmd +++ b/motion/ecmc_axis.cmd @@ -22,7 +22,7 @@ ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}verifyOrDie.cmd "EXPR_STR='abs(${ECMC_DRV_SCALE #- ECMC_DRV_SCALE_DENOM ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}verifyOrDie.cmd "EXPR_STR='abs(${ECMC_DRV_SCALE_DENOM})<>0',SUCCESS_STR='ECMC_DRV_SCALE_DENOM value OK == ${ECMC_DRV_SCALE_DENOM}...',ERROR_STR='ECMC_DRV_SCALE_DENOM == 0...'" -#- Issue Warning if ECMC_MRES is set. MRES calculated bu SREV and UREV instead +#- Issue Warning if ECMC_MRES is set. MRES calculated by SREV and UREV instead ecmcFileExist("${ECMC_CONFIG_ROOT}issueWarning.cmd",1) ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}issueWarning.cmd "EXPR_STR='${ECMC_MRES=-1}>0',WARNING_STR='WARNING: ECMC_MRES setting is deprecated and will not be used. (MRES will be calulated instead: ECMC_ENC_SCALE_NUM/ECMC_ENC_SCALE_DENOM).. '" diff --git a/motion/ecmc_virt_axis.cmd b/motion/ecmc_virt_axis.cmd index fbb4da6f8..9605dad93 100644 --- a/motion/ecmc_virt_axis.cmd +++ b/motion/ecmc_virt_axis.cmd @@ -18,7 +18,7 @@ ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}verifyOrDie.cmd "EXPR_STR='abs(${ECMC_ENC_SCALE #- ECMC_ENC_SCALE_DENOM ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}verifyOrDie.cmd "EXPR_STR='abs(${ECMC_ENC_SCALE_DENOM})<>0',SUCCESS_STR='ECMC_ENC_SCALE_DENOM value OK == ${ECMC_ENC_SCALE_DENOM}...',ERROR_STR='ECMC_ENC_SCALE_DENOM == 0...'" -#- Issue Warning if ECMC_MRES is set. MRES calculated bu SREV and UREV instead +#- Issue Warning if ECMC_MRES is set. MRES calculated by SREV and UREV instead ecmcFileExist("${ECMC_CONFIG_ROOT}issueWarning.cmd",1) ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}issueWarning.cmd "EXPR_STR='${ECMC_MRES=-1}>0',WARNING_STR='WARNING: ECMC_MRES setting is deprecated and will not be used. (MRES will be calulated instead: ECMC_ENC_SCALE_NUM/ECMC_ENC_SCALE_DENOM).. '" diff --git a/motion/ecmc_virt_axis_unset.cmd b/motion/ecmc_virt_axis_unset.cmd index 9d69f38ad..75dbaddb3 100644 --- a/motion/ecmc_virt_axis_unset.cmd +++ b/motion/ecmc_virt_axis_unset.cmd @@ -51,7 +51,6 @@ epicsEnvUnset(ECMC_MON_VELO_MAX) epicsEnvUnset(ECMC_MON_VELO_MAX_ENA) epicsEnvUnset(ECMC_MON_VELO_MAX_DRV_TIME) epicsEnvUnset(ECMC_MON_VELO_MAX_TRAJ_TIME) -epicsEnvUnset(ECMC_MRES) epicsEnvUnset(ECMC_JOG_VEL) epicsEnvUnset(ECMC_JAR) epicsEnvUnset(ECMC_HOME_PROC) From 53cd21df7a178a22a4b21e83ece541b7f2a28853 Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Thu, 28 Sep 2023 14:47:59 +0200 Subject: [PATCH 2/2] Remove ECMC_HOME_DEC and HOMEDEC They have no effect and are misleading to the user --- motion/ecmc_axis_mr.cmd | 2 +- motion/ecmc_axis_unset.cmd | 1 - motion/ecmc_virt_axis_unset.cmd | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/motion/ecmc_axis_mr.cmd b/motion/ecmc_axis_mr.cmd index 69b7400f9..1d1622249 100644 --- a/motion/ecmc_axis_mr.cmd +++ b/motion/ecmc_axis_mr.cmd @@ -24,7 +24,7 @@ ${ECMC_BLOCK_ACCS} dbLoadRecords(${ECMC_MR_MODULE="ecmcMotorRecord${ECMC_PVA}"}. epicsEnvSet("ECMC_AXISFIELDINIT", "") 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}, HOMEDEC=${ECMC_HOME_DEC}") +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}") #- Cleanup epicsEnvUnset(ECMC_TEMP_SREV) diff --git a/motion/ecmc_axis_unset.cmd b/motion/ecmc_axis_unset.cmd index 6aadbd676..734b6a22a 100644 --- a/motion/ecmc_axis_unset.cmd +++ b/motion/ecmc_axis_unset.cmd @@ -85,7 +85,6 @@ epicsEnvUnset(ECMC_JAR) epicsEnvUnset(ECMC_HOME_PROC) epicsEnvUnset(ECMC_HOME_POS) epicsEnvUnset(ECMC_HOME_ACC) -epicsEnvUnset(ECMC_HOME_DEC) epicsEnvUnset(ECMC_DRV_TYPE) epicsEnvUnset(ECMC_SOFT_LOW_LIM) epicsEnvUnset(ECMC_SOFT_HIGH_LIM) diff --git a/motion/ecmc_virt_axis_unset.cmd b/motion/ecmc_virt_axis_unset.cmd index 9d69f38ad..00bdad290 100644 --- a/motion/ecmc_virt_axis_unset.cmd +++ b/motion/ecmc_virt_axis_unset.cmd @@ -57,7 +57,6 @@ epicsEnvUnset(ECMC_JAR) epicsEnvUnset(ECMC_HOME_PROC) epicsEnvUnset(ECMC_HOME_POS) epicsEnvUnset(ECMC_HOME_ACC) -epicsEnvUnset(ECMC_HOME_DEC) epicsEnvUnset(ECMC_DRV_TYPE) epicsEnvUnset(ECMC_VELO) epicsEnvUnset(ECMC_SOFT_LOW_LIM)