-
Notifications
You must be signed in to change notification settings - Fork 5
Adding packet parsing for status and error #119
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.
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,12 +5,13 @@ | |
| from modules.telemetry.packet_spec.headers import * | ||
| from modules.misc.unit_conversions import * | ||
| from typing import Any | ||
|
|
||
| from modules.misc.config import Config | ||
|
|
||
| @dataclass | ||
| class Block: | ||
| # A format for the struct class to unpack the block from bytes | ||
| _struct_format: str = field(default="", init=False, repr=False) | ||
| config = Config.from_json({}) | ||
|
|
||
| @classmethod | ||
| def size(cls) -> int: | ||
|
|
@@ -225,6 +226,27 @@ def output_formatted(self, into: dict[str, Any]): | |
| add_to_dict(into, ["magnetic_field", "magnitude"], magnitude(self.x_axis, self.y_axis, self.z_axis)) | ||
|
|
||
|
|
||
| @dataclass | ||
| class FlightStatus(TimedBlock): | ||
| _struct_format: str = field(default="<hB", init=False, repr=False) | ||
| flight_status: int | ||
| def output_formatted(self, into: dict[str, Any]): | ||
| add_to_dict(into, ["flight_status", "flight_status"], self.config.parsing_parameters["status_codes"][self.flight_status]) | ||
|
||
|
|
||
| @dataclass | ||
| class FlightError(TimedBlock): | ||
| _struct_format: str = field(default="<hBB", init=False, repr=False) | ||
| measurement_time: int | ||
| proc_id: int | ||
| error_code: int | ||
|
|
||
| proc_id = proc_id & 0b00011111 | ||
|
|
||
| def output_formatted(self, into: dict[str, Any]): | ||
| add_to_dict(into, ["flight_error", "mission_time"], self.measurement_time) | ||
| add_to_dict(into, ["flight_error", "proc_id"], self.proc_id) | ||
| add_to_dict(into, ["flight_error", "error_code"], self.config.parsing_parameters["error_codes"][self.error_code]) | ||
|
|
||
| class InvalidBlockContents(Exception): | ||
| """Exception raised when invalid block contents are encountered""" | ||
|
|
||
|
|
@@ -277,6 +299,10 @@ def get_block_class(type: BlockType) -> type[Block]: | |
| return Voltage | ||
| case BlockType.MAGNETIC_FIELD: | ||
| return MagneticField | ||
| case BlockType.STATUS_MESSAGE: | ||
| return FlightStatus | ||
| case BlockType.ERROR_MESSAGE: | ||
| return FlightError | ||
| case _: | ||
| raise ValueError(f"Unsupported block type: {type}") | ||
|
|
||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These can probably be hardcoded as enums in the packet spec files. In the case that we want to dynamically update these, we'll need to reboot anyway. This would also leave this file as radio configs, and if sometime in the future we want more configs for things like anomalous faults, we can have that be a new file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are you sure? I was told in the chat to put it in the config