Merge pull request #196 from cdn-lnk/mres

Remove ECMC_MRES from ecmc_virt_axis_unset.cmd
paulscherrerinstitute · Sep 27, 2023 · 6343f29 · 6343f29
2 parents c4aeb29 + c40bbfc
commit 6343f29
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)