Skip to content

ENH: acceleration data to trigger parachutes #911

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
ViniciusCMB wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

ENH: acceleration data to trigger parachutes #911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2575950
ENH: Pass Acceleration Data to Parachute Trigger Functions (RocketPy-…
ViniciusCMB Dec 4, 2025
7ec7ac9
ENH: Add acceleration-based parachute triggers with IMU sensor simula…
ViniciusCMB Dec 7, 2025
18aab57
ENH: Enable sensors+acceleration triggers in parachutes
ViniciusCMB Dec 8, 2025
0932277
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
ViniciusCMB Dec 8, 2025
916b0fc
STY: Apply ruff format to flight.py
ViniciusCMB Dec 8, 2025
8e88fa8
STY: Fix pylint for parachute triggers
ViniciusCMB Dec 9, 2025
e84df40
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
ViniciusCMB Dec 9, 2025
a7f5c3a
TST: Add comprehensive unit tests for acceleration-based parachute tr…
ViniciusCMB Dec 9, 2025
ad7e6d0
DOC: Add comprehensive documentation for acceleration-based parachute…
ViniciusCMB Dec 9, 2025
8f65022
STY: Apply ruff format to test_parachute_trigger_acceleration.py
ViniciusCMB Dec 9, 2025
d45b3a5
STY: Fix pylint warnings in test_parachute_triggers.py
ViniciusCMB Dec 9, 2025
6d79d62
FIX: Add missing u_dot parameter to direct triggerfunc calls
ViniciusCMB Dec 9, 2025
5619b3a
STY: Apply ruff format to flight.py
ViniciusCMB Dec 9, 2025
c66cffc
MNT: align acceleration trigger API with review feedback
ViniciusCMB Mar 22, 2026
56c1e51
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
ViniciusCMB Mar 22, 2026
02d344d
STY: apply ruff format fixes
ViniciusCMB Mar 22, 2026
00e94b9
STY: apply ruff format fixes to flight.py
ViniciusCMB Mar 22, 2026
a0cb73d
STY: Apply ruff check after pip update
ViniciusCMB Mar 25, 2026
aba648b
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
ViniciusCMB Mar 25, 2026
6beab3c
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
MateusStano Mar 27, 2026
aa89d50
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
MateusStano Mar 27, 2026
6a9795d
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
MateusStano Apr 4, 2026
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
Prev Previous commit
Next Next commit
Merge branch 'develop' into enh/acceleration-data-to-trigger-parachutes
  • Loading branch information
@ViniciusCMB
ViniciusCMB authored Mar 22, 2026
commit 56c1e51521bd1c071939fbdd47bf56bc7e049e3b
30 changes: 18 additions & 12 deletions rocketpy/simulation/flight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,12 @@ def __simulate(self, verbose):
lambda self, parachute_porosity=parachute.porosity: setattr(
self, "parachute_porosity", parachute_porosity
),
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: (
setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
)
),
]
self.flight_phases.add_phase(
Expand Down Expand Up @@ -989,10 +991,12 @@ def __check_and_handle_parachute_triggers(
lambda self, parachute_porosity=parachute.porosity: setattr(
self, "parachute_porosity", parachute_porosity
),
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: (
setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
)
),
]
self.flight_phases.add_phase(
Expand Down Expand Up @@ -1398,10 +1402,12 @@ def __check_overshootable_parachute_triggers(
lambda self, parachute_porosity=parachute.porosity: setattr(
self, "parachute_porosity", parachute_porosity
),
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
lambda self, added_mass_coefficient=parachute.added_mass_coefficient: (
setattr(
self,
"parachute_added_mass_coefficient",
added_mass_coefficient,
)
),
]
self.flight_phases.add_phase(
Expand Down
11 changes: 2 additions & 9 deletions tests/unit/simulation/test_monte_carlo_plots_background.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
from unittest.mock import MagicMock, patch

import matplotlib.pyplot as plt
import numpy as np
import pytest
from PIL import UnidentifiedImageError # pylint: disable=unused-import
from PIL import UnidentifiedImageError

from rocketpy.plots.monte_carlo_plots import _MonteCarloPlots
from rocketpy.simulation import MonteCarlo
Expand Down Expand Up @@ -179,10 +180,6 @@ def test_ellipses_background_raises_error_when_contextily_not_installed(mock_sho
mock_show : unittest.mock.MagicMock
Mocks the matplotlib.pyplot.show() function to avoid displaying plots.
"""
mock_monte_carlo = MockMonteCarlo(environment=SimpleEnvironment())
from rocketpy.tools import (
import_optional_dependency as original_import, # pylint: disable=import-outside-toplevel
)

mock_monte_carlo = MockMonteCarlo(environment=SimpleEnvironment())

Expand Down Expand Up @@ -361,10 +358,6 @@ def test_ellipses_background_handles_bounds2img_failures(
expected_messages : list of str
List of expected message substrings in the raised exception.
"""
mock_monte_carlo = MockMonteCarlo(environment=SimpleEnvironment())
from rocketpy.tools import (
import_optional_dependency as original_import, # pylint: disable=import-outside-toplevel
)

mock_monte_carlo = MockMonteCarlo(environment=SimpleEnvironment())
contextily = pytest.importorskip("contextily")
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.