Skip to content

fix: ignore encoder.source from YAML loaded by loadYamlEnc.cmd #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fxmr41 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ignore encoder.source from YAML loaded by loadYamlEnc.cmd #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions scripts/jinja2/loadYamlEnc.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#- halt the ioc startup in case of an error
on error halt

epicsEnvSet(ECMC_IS_LOAD_YAML_ENC, 1)

#- setup python venv and run `plcYamlJinja2.py`
#- MUST be in the same 'system'-context!!!
ecmcIf("'$(ECMC_CFG_TOOL=jinja)'=='ecb'")
Expand All @@ -36,5 +38,6 @@ ${SCRIPTEXEC} "${ECMC_TMP_DIR}${FILE}.enc"

#- cleanup
system "rm -rf ${ECMC_TMP_DIR}${FILE}.enc"
epicsEnvUnset(ECMC_IS_LOAD_YAML_ENC)
#- reset PREFIX
epicsEnvSet("ECMC_PREFIX" "${SM_PREFIX}")
6 changes: 5 additions & 1 deletion scripts/jinja2/templates/encoder.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@ epicsEnvSet(ECMC_ENC_CFG_ID,${ECMC_CONFIG_RETURN_VAL})
{#- scaling #}
ecmcConfigOrDie "Cfg.SetAxisEncScaleDenom(${ECMC_AXIS_NO},{{ encoder.denominator|float }})"
ecmcConfigOrDie "Cfg.SetAxisEncScaleNum(${ECMC_AXIS_NO},{{ encoder.numerator }})"

{#- source #}
ecmcConfigOrDie "Cfg.SetAxisEncSourceType(${ECMC_AXIS_NO},{{ encoder.source }})"
ecmcIf("${ECMC_IS_LOAD_YAML_ENC=0}=0")
${IF_TRUE}ecmcConfigOrDie "Cfg.SetAxisEncSourceType(${ECMC_AXIS_NO},{{ encoder.source }})"
ecmcEndIf()

{#- data #}
ecmcConfigOrDie "Cfg.SetAxisEncType(${ECMC_AXIS_NO},{{ encoder.type }})"
ecmcConfigOrDie "Cfg.SetAxisEncBits(${ECMC_AXIS_NO},{{ encoder.bits }})"
Expand Down
Loading