Skip to content

Commit 3beb0e8

Browse files
authored
Merge branch 'develop' into enh/add_dry_mass_total_mass_ratio
2 parents 3bfa766 + 2b63cd9 commit 3beb0e8

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Attention: The newest changes should be on top -->
5050

5151
### Fixed
5252

53+
- BUG: Fix Motor Zero Dry Mass Check [#710](https://github.com/RocketPy-Team/RocketPy/pull/710)
5354
- BUG: Fix Environment.max_expected_height for custom atmosphere [#707](https://github.com/RocketPy-Team/RocketPy/pull/707)
5455
- BUG: Initialize _Controller Init Parameters [#703](https://github.com/RocketPy-Team/RocketPy/pull/703)
5556
- BUG: Rail Buttons Not Accepted in Add Surfaces [#701](https://github.com/RocketPy-Team/RocketPy/pull/701)

docs/reference/classes/sensors/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Sensor Classes
99
Accelerometer Class <accelerometer>
1010
Barometer Class <barometer>
1111
Gyroscope Class <gyroscope>
12-
GNSS Receiver Class <gnss>
12+
GNSS Receiver Class <gnss_receiver>

docs/user/environment/0-setup/elevation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ It is integrated with RocketPy and can be used as follows.
3535

3636
First, initialize a new Environment:
3737

38-
.. jupyter-execute::
38+
.. code-block:: python
3939
4040
env = Environment(
4141
date=(2019, 2, 10, 18),
@@ -45,13 +45,13 @@ First, initialize a new Environment:
4545
4646
Then, set the elevation using Open-Elevation:
4747

48-
.. jupyter-execute::
48+
.. code-block:: python
4949
5050
env.set_elevation("Open-Elevation")
5151
5252
To get information from the Environment, use the following method:
5353

54-
.. jupyter-execute::
54+
.. code-block:: python
5555
5656
env.prints.launch_site_details()
5757

docs/user/environment/1-atm-models/soundings.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ We will use the same sounding station as we did for the Wyoming Soundings.
7070

7171
Initialize a new Environment instance:
7272

73-
.. jupyter-execute::
73+
.. code-block:: python
7474
7575
url = r"https://rucsoundings.noaa.gov/get_raobs.cgi?data_source=RAOB&latest=latest&start_year=2019&start_month_name=Feb&start_mday=5&start_hour=12&start_min=0&n_hrs=1.0&fcst_len=shortest&airport=83779&text=Ascii%20text%20%28GSD%20format%29&hydrometeors=false&start=latest"
7676

rocketpy/motors/motor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def dry_mass(self, dry_mass):
370370
dry_mass : float
371371
Motor dry mass in kg.
372372
"""
373-
if dry_mass:
373+
if dry_mass is not None:
374374
if isinstance(dry_mass, (int, float)):
375375
self._dry_mass = dry_mass
376376
else:

0 commit comments

Comments
 (0)