Add Hexadecimal state handling to excel_to_xtce #1159
Merged
Conversation
This file contains 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
sdhoyt
added
enhancement
sdhoyt
requested review from
vmartinez-cu,
laspsandoval and
maxinelasp
and removed request for
a team
Comment on lines
419
to
423
| if isinstance(value, str) and value.startswith("0x"): | ||
| state["value"] = int(value, 16) | ||
| return state | ||
| # return if already an int | ||
| elif isinstance(value, int): |
There was a problem hiding this comment.
If integers are more common than hex values, you could switch the if/elif logic to check if value is an integer first. There might be a slight performance gain there.
There was a problem hiding this comment.
Good point, I'll update that
vmartinez-cu
approved these changes
Nov 15, 2024
tech3371
reviewed
Nov 18, 2024
| @@ -197,7 +197,7 @@ def xtce_excel_file(tmp_path): | |||
| states = { | |||
| "packetName": ["TEST_PACKET"] * 2, | |||
| "mnemonic": ["VAR_STATE"] * 2, | |||
| "value": [0, 1], | |||
| "value": [0, "0x1"], | |||
There was a problem hiding this comment.
can you add this hex test as another one without deleting that one? I think we need to test that also
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change Summary
Overview
Some telemetry definition housekeeping state values are listed in hexadecimal form.
space-packet-parserrequires states to be in decimal form. This PR adds a function to ensure that the state value is an integer or a hexadecimal string is converted to an integer.Closes #1158