emccalib: ignore ini refs embedded in pin names (#4165)#4166
Open
grandixximo wants to merge 1 commit into
Open
emccalib: ignore ini refs embedded in pin names (#4165)#4166grandixximo wants to merge 1 commit into
grandixximo wants to merge 1 commit into
Conversation
Only treat a setp line as tunable when the ini reference is the value being set, not when it appears inside the pin name. Fixes the invalid widget name crash in the calibration tool (issue LinuxCNC#4165).
Contributor
Author
|
If this works should merge to 2.10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4165.
The calibration tool (
emccalib.tcl) crashed withinvalid command name ".main.top.fpage2.next-(mesa_pwm_pin).dither true"when a HAL file used ini-variable expansion inside a pin name, e.g.:find_ini_refsmatched the stanza anywhere on the line and derived the ini name by splitting the whole line on]and taking the last token. That assumes the ini reference is the setp value (setp pid.0.Pgain [JOINT_0]PGAIN). With the reference in the pin name it produced(mesa_pwm_pin).dither true, yielding an invalid Tk widget path that later blew up ininiTuneButtonpress.Fix: only treat a line as tunable when the ini reference is the setp value (3rd token), and derive the name from that token (stripping parens for the
[SEC](NAME)form).Verified on @NoGare's config: pin-name refs are now ignored, while genuine tunables on the same lines (
.scale [JOINT_2]SCALE,[JOINT_2](ENCODER_SCALE)) still appear; normalsetp pin [SEC]NAMEconfigs are unaffected.@NoGare please test against your config and confirm.