diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 806bef0dc..25b76cef0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,10 +1,13 @@ name: Documentation on: - # Only PRs targeting master (base branch = master) and pushes to master. + # develop as well as master. Work lands on develop first, so a base of master + # alone meant the only run was the release pull request: a docstring that does + # not build sat on develop until then and failed the merge that was supposed + # to ship it, which is how the four warnings this fixes went unnoticed. pull_request: types: [opened, synchronize, reopened, ready_for_review] - branches: [master] + branches: [master, develop] paths: - "docs/**" - "rocketpy/**" # docstrings feed the autodoc API reference @@ -13,7 +16,7 @@ on: - ".readthedocs.yaml" - ".github/workflows/docs.yml" push: - branches: [master] + branches: [master, develop] paths: - "docs/**" - "rocketpy/**" diff --git a/docs/examples/index.rst b/docs/examples/index.rst index bd7506c30..d90fcfc83 100644 --- a/docs/examples/index.rst +++ b/docs/examples/index.rst @@ -106,6 +106,7 @@ In the next sections you will find the simulations of the rockets listed above. prometheus_2022_flight_sim.ipynb erebus_flight_sim.ipynb halcyon_flight_sim.ipynb + halcyon_flight_sim_active_control.ipynb cavour_flight_sim.ipynb genesis_flight_sim.ipynb camoes_flight_sim.ipynb diff --git a/rocketpy/rocket/rocket.py b/rocketpy/rocket/rocket.py index 46d11cc08..f3b8c4a95 100644 --- a/rocketpy/rocket/rocket.py +++ b/rocketpy/rocket/rocket.py @@ -2004,7 +2004,6 @@ def add_thrust_vector_control( rocket. The most recent measurements of the sensors are provided with the ``sensor.measurement`` attribute. The sensors are listed in the same order as they are added to the rocket - ``interactive_objects`` This function will be called during the simulation at the specified sampling rate. The function should evaluate and change the observed @@ -2164,7 +2163,6 @@ def add_roll_control( rocket. The most recent measurements of the sensors are provided with the ``sensor.measurement`` attribute. The sensors are listed in the same order as they are added to the rocket - `interactive_objects` This function will be called during the simulation at the specified sampling rate. The function should evaluate and change the observed @@ -2300,7 +2298,6 @@ def add_throttle_control( rocket. The most recent measurements of the sensors are provided with the ``sensor.measurement`` attribute. The sensors are listed in the same order as they are added to the rocket - ``interactive_objects`` This function will be called during the simulation at the specified sampling rate. The function should evaluate and change the observed