Merge branch 'paulscherrerinstitute:master' into master

paulscherrerinstitute · Sep 29, 2023 · c494529 · c494529
2 parents d870c20 + 27a75bd
commit c494529
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 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_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
@@ -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.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,13 +51,11 @@ 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)
 epicsEnvUnset(ECMC_HOME_POS)
 epicsEnvUnset(ECMC_HOME_ACC)
-epicsEnvUnset(ECMC_HOME_DEC)
 epicsEnvUnset(ECMC_DRV_TYPE)
 epicsEnvUnset(ECMC_VELO)
 epicsEnvUnset(ECMC_SOFT_LOW_LIM)