-
Notifications
You must be signed in to change notification settings - Fork 0
Add Liquid Avionics to SDECV2 #61
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
Draft
niekky
wants to merge
4
commits into
main
Choose a base branch
from
nn/liquids
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| # Copyright (c) 2025 Sun Devil Rocketry | ||
|
|
||
| from .engine_state import EngineState, ENGINE_STATE_NAMES, Valve, VALVES, parse_valve_byte | ||
| from .engine_controller import ( | ||
| CONTROLLER_ID, CONTROLLER_NAME, | ||
| TelemetryData, | ||
| hotfire_abort, preflight_purge, fill_chill, standby, hotfire, | ||
| stop_hotfire, stop_purge, lox_purge, manual_mode, | ||
| get_state, telemetry_request, | ||
| ) | ||
| from .flash_extract import EngineControllerFlashFrame, flash_extract |
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 |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| # Copyright (c) 2025 Sun Devil Rocketry | ||
|
|
||
| from dataclasses import dataclass | ||
| from typing import Dict, Optional | ||
|
|
||
| from SDECv2.SerialController import SerialObj | ||
| from SDECv2.Sensor import create_sensors | ||
| from SDECv2.Sensor.util import process_data_bytes | ||
| from .engine_state import EngineState, parse_valve_byte | ||
|
|
||
| CONTROLLER_ID = b"\x08" | ||
| CONTROLLER_NAME = "Liquid Engine Controller (L0002 Rev 5.0)" | ||
|
|
||
| _ACK = b"\x95" | ||
| _NO_ACK = b"\x98" | ||
|
|
||
| _OPCODE_ABORT = b"\x90" | ||
| _OPCODE_PREFLIGHT_PURGE = b"\x91" | ||
| _OPCODE_FILL_CHILL = b"\x92" | ||
| _OPCODE_STANDBY = b"\x93" | ||
| _OPCODE_HOTFIRE = b"\x94" | ||
| _OPCODE_TELREQ = b"\x96" | ||
| _OPCODE_STOP_PURGE = b"\x97" | ||
| _OPCODE_GET_STATE = b"\x99" | ||
| _OPCODE_STOP_HOTFIRE = b"\x9A" | ||
| _OPCODE_LOX_PURGE = b"\x9B" | ||
| _OPCODE_MANUAL = b"\x9E" | ||
|
|
||
| _SENSOR_DUMP_SIZE = 40 # 10 sensors × 4 bytes each | ||
|
|
||
|
|
||
| @dataclass | ||
| class TelemetryData: | ||
| """Snapshot of engine controller telemetry. | ||
|
|
||
| :param sensor_readings: Mapping of sensor short-name to converted | ||
| value in physical units (psi / lb / °C). | ||
| :type sensor_readings: Dict[str, float] | ||
| :param valve_states: Mapping of valve name to its current physical | ||
| state string (``"OPEN"`` or ``"CLOSED"``). | ||
| :type valve_states: Dict[str, str] | ||
| """ | ||
| sensor_readings: Dict[str, float] | ||
| valve_states: Dict[str, str] | ||
|
|
||
|
|
||
| def _send_state_command(serial: SerialObj, opcode: bytes) -> bool: | ||
| """Send a single-byte opcode and return whether the controller acknowledged. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :param opcode: 1-byte command opcode. | ||
| :type opcode: bytes | ||
| :returns: ``True`` if the controller replied with ``ACK`` (``0x95``). | ||
| :rtype: bool | ||
| """ | ||
| serial.send(opcode) | ||
| return serial.read() == _ACK | ||
|
|
||
|
|
||
| def hotfire_abort(serial: SerialObj) -> bool: | ||
| """Send the abort command, transitioning the engine to ``ABORT`` state. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_ABORT) | ||
|
|
||
| def preflight_purge(serial: SerialObj) -> bool: | ||
| """Initiate the pre-fire purge sequence (``PRE_FIRE_PURGE`` state). | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_PREFLIGHT_PURGE) | ||
|
|
||
| def fill_chill(serial: SerialObj) -> bool: | ||
| """Initiate the fill-and-chill sequence (``FILL_AND_CHILL`` state). | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_FILL_CHILL) | ||
|
|
||
| def standby(serial: SerialObj) -> bool: | ||
| """Transition the engine to ``STANDBY`` state. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_STANDBY) | ||
|
|
||
| def hotfire(serial: SerialObj) -> bool: | ||
| """Initiate ignition, transitioning the engine to ``FIRE`` state. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_HOTFIRE) | ||
|
|
||
| def stop_hotfire(serial: SerialObj) -> bool: | ||
| """Terminate the engine burn. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_STOP_HOTFIRE) | ||
|
|
||
| def stop_purge(serial: SerialObj) -> bool: | ||
| """Stop the post-fire purge, transitioning the engine to ``DISARM`` state. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_STOP_PURGE) | ||
|
|
||
| def lox_purge(serial: SerialObj) -> bool: | ||
| """Initiate the LOX tank purge sequence. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_LOX_PURGE) | ||
|
|
||
| def manual_mode(serial: SerialObj) -> bool: | ||
| """Enter manual valve control mode (``MANUAL`` state). | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: ``True`` on acknowledgement. | ||
| :rtype: bool | ||
| """ | ||
| return _send_state_command(serial, _OPCODE_MANUAL) | ||
|
|
||
|
|
||
| def get_state(serial: SerialObj) -> Optional[EngineState]: | ||
| """Query the current engine state from the controller. | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: The current :class:`~SDECv2.EngineController.engine_state.EngineState`, | ||
| or ``None`` on timeout, ``NACK``, or an unrecognized state byte. | ||
| :rtype: Optional[EngineState] | ||
| """ | ||
| serial.send(_OPCODE_GET_STATE) | ||
| response = serial.read() | ||
| if not response or response == _NO_ACK: | ||
| return None | ||
| try: | ||
| return EngineState(response[0]) | ||
| except ValueError: | ||
| return None | ||
|
|
||
|
|
||
| def telemetry_request(serial: SerialObj) -> Optional[TelemetryData]: | ||
| """Request a snapshot of all sensor readings and valve states. | ||
|
|
||
| Sends opcode ``0x96``, waits for ``ACK`` (``0x95``), then reads | ||
| 40 bytes of sensor data followed by 1 byte of valve state. | ||
| Conversion functions are applied, so all sensor values are in | ||
| physical units (psi / lb / °C). | ||
|
|
||
| :param serial: Open serial connection to the engine controller. | ||
| :type serial: SerialObj | ||
| :returns: :class:`TelemetryData` containing converted sensor readings | ||
| and decoded valve states, or ``None`` if the controller did not | ||
| acknowledge. | ||
| :rtype: Optional[TelemetryData] | ||
| """ | ||
| serial.send(_OPCODE_TELREQ) | ||
| if serial.read() != _ACK: | ||
| return None | ||
|
|
||
| sensor_data_bytes = serial.read(_SENSOR_DUMP_SIZE) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could change this to get the size using the create_sensors function and then calculating the size of all the sensors. This way we avoid hardcoded values |
||
| valve_byte = serial.read() | ||
|
|
||
| sensors = create_sensors.engine_controller_rev5_sensors() | ||
| sensor_readings: Dict[str, float] = {} | ||
| for sensor in sensors: | ||
| raw = sensor_data_bytes[sensor.offset: sensor.offset + sensor.size] | ||
| value = process_data_bytes(raw, sensor.data_type, sensor.convert_data) | ||
| sensor_readings[sensor.short_name] = value | ||
|
|
||
| valve_states = parse_valve_byte(valve_byte) | ||
| return TelemetryData(sensor_readings=sensor_readings, valve_states=valve_states) | ||
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 |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| # Copyright (c) 2025 Sun Devil Rocketry | ||
|
|
||
| from dataclasses import dataclass | ||
| from enum import IntEnum | ||
| from typing import Dict | ||
|
|
||
|
|
||
| class EngineState(IntEnum): | ||
| """Engine controller state machine states. | ||
|
|
||
| States progress through the nominal hotfire sequence: | ||
| ``INITIALIZATION`` → ``READY`` → ``PRE_FIRE_PURGE`` → ``FILL_AND_CHILL`` | ||
| → ``STANDBY`` → ``FIRE`` → ``DISARM`` → ``POST_FIRE``. | ||
|
|
||
| ``MANUAL`` and ``ABORT`` are reachable from any state. | ||
| """ | ||
| INITIALIZATION = 0x00 | ||
| READY = 0x01 | ||
| PRE_FIRE_PURGE = 0x02 | ||
| FILL_AND_CHILL = 0x03 | ||
| STANDBY = 0x04 | ||
| FIRE = 0x05 | ||
| DISARM = 0x06 | ||
| POST_FIRE = 0x07 | ||
| MANUAL = 0x08 | ||
| ABORT = 0x09 | ||
|
|
||
|
|
||
| #: Human-readable display names for each :class:`EngineState`. | ||
| ENGINE_STATE_NAMES: Dict[EngineState, str] = { | ||
| EngineState.INITIALIZATION: "Initialization", | ||
| EngineState.READY: "Ready", | ||
| EngineState.PRE_FIRE_PURGE: "Pre-Fire Purge", | ||
| EngineState.FILL_AND_CHILL: "Fill and Chill", | ||
| EngineState.STANDBY: "Standby", | ||
| EngineState.FIRE: "Fire", | ||
| EngineState.DISARM: "Disarm", | ||
| EngineState.POST_FIRE: "Post-Fire", | ||
| EngineState.MANUAL: "Manual", | ||
| EngineState.ABORT: "Abort", | ||
| } | ||
|
|
||
|
|
||
| @dataclass(frozen=True) | ||
| class Valve: | ||
| """Metadata for a single solenoid valve. | ||
|
|
||
| :param name: Valve identifier string (e.g. ``"oxPress"``). | ||
| :param on_state: Physical state when the valve bit is **set** | ||
| (e.g. ``"OPEN"`` or ``"CLOSED"``). | ||
| :param off_state: Physical state when the valve bit is **clear**. | ||
| """ | ||
| name: str | ||
| on_state: str | ||
| off_state: str | ||
|
|
||
|
|
||
| #: All eight valves keyed by 1-indexed bit position in the telemetry valve byte. | ||
| #: Bit *n* maps to ``(1 << (n - 1))`` in the byte returned by | ||
| #: :func:`~SDECv2.EngineController.engine_controller.telemetry_request`. | ||
| VALVES: Dict[int, Valve] = { | ||
| 1: Valve("oxPress", "OPEN", "CLOSED"), | ||
| 2: Valve("fuelPress", "OPEN", "CLOSED"), | ||
| 3: Valve("oxVent", "CLOSED", "OPEN"), | ||
| 4: Valve("fuelVent", "CLOSED", "OPEN"), | ||
| 5: Valve("oxPurge", "CLOSED", "OPEN"), | ||
| 6: Valve("fuelPurge", "CLOSED", "OPEN"), | ||
| 7: Valve("oxMain", "OPEN", "CLOSED"), | ||
| 8: Valve("fuelMain", "OPEN", "CLOSED"), | ||
| } | ||
|
|
||
|
|
||
| def parse_valve_byte(valve_byte: bytes) -> Dict[str, str]: | ||
| """Decode the 1-byte valve bitmask from telemetry into a valve name → state mapping. | ||
|
|
||
| :param valve_byte: Single byte received from the engine controller where | ||
| each bit represents one valve's state (bit 0 = valve 1, etc.). | ||
| :type valve_byte: bytes | ||
| :returns: Mapping of valve name to its physical state string | ||
| (``"OPEN"`` or ``"CLOSED"``). | ||
| :rtype: Dict[str, str] | ||
| """ | ||
| valve_int = valve_byte[0] | ||
| states: Dict[str, str] = {} | ||
| for bit_pos, valve in VALVES.items(): | ||
| if valve_int & (1 << (bit_pos - 1)): | ||
| states[valve.name] = valve.on_state | ||
| else: | ||
| states[valve.name] = valve.off_state | ||
| return states |
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.
here sensor frame is 44 bytes but in engine_controller.py sensor_dump size is 40 bytes. the controller's sensor_frame_size isn't used for anything but updating for consistency's sake would be nice.