From ad0b6bdc6b6738bf98f0fd4664148272068ba5d6 Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Thu, 12 Feb 2026 15:07:31 +1100 Subject: [PATCH] Subedit --- docs/en/dev_setup/building_px4.md | 5 +++-- docs/en/dev_setup/config_initial.md | 8 ++++---- docs/en/dev_setup/dev_env.md | 6 +++--- docs/en/dev_setup/dev_env_windows_wsl.md | 16 ++++++++-------- docs/en/ros/mavros_installation.md | 4 ++-- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/docs/en/dev_setup/building_px4.md b/docs/en/dev_setup/building_px4.md index c683627102..576266ae4d 100644 --- a/docs/en/dev_setup/building_px4.md +++ b/docs/en/dev_setup/building_px4.md @@ -127,7 +127,8 @@ The following list shows the build commands for the [Pixhawk standard](../flight - [Pixhawk 1 (FMUv2)](../flight_controller/pixhawk.md): `make px4_fmu-v2_default` :::warning - You **must** use a supported version of GCC to build this board (e.g. the `gcc-arm-none-eabi` package from the current Ubuntu LTS, which is the same toolchain used by CI) or remove modules from the build. Building with an unsupported GCC may fail, as PX4 is close to the board's 1MB flash limit. + You **must** use a supported version of GCC to build this board (e.g. the `gcc-arm-none-eabi` package from the current Ubuntu LTS, which is the same toolchain used by CI) or remove modules from the build. + Building with an unsupported GCC may fail, as PX4 is close to the board's 1MB flash limit. ::: - Pixhawk 1 with 2 MB flash: `make px4_fmu-v3_default` @@ -238,7 +239,7 @@ You may need to install it using: pip3 install --user jinja2 ``` -If you have already installed these dependencies this may be because there is more than one Python version on the computer (e.g. Python 2.7.16 Python 3.8.3), and the module is not present in the version used by the build toolchain. +If you have already installed these dependencies this may be because there is more than one Python version on the computer (e.g. Python 2.7.16 and Python 3.8.3), and the module is not present in the version used by the build toolchain. You should be able to fix this by explicitly installing the dependencies as shown: diff --git a/docs/en/dev_setup/config_initial.md b/docs/en/dev_setup/config_initial.md index f636aef195..b98f0bf24e 100644 --- a/docs/en/dev_setup/config_initial.md +++ b/docs/en/dev_setup/config_initial.md @@ -20,7 +20,7 @@ The equipment below is highly recommended: ::: - Lenovo Thinkpad with i5-core running Windows 11 - MacBook Pro (early 2015 and later) with macOS 10.15 or later - - Lenovo Thinkpad i5 with Ubuntu Linux 20.04 or later + - Lenovo Thinkpad i5 with Ubuntu Linux 22.04 or later - **Ground control station** (computer or tablet): - iPad (may require Wifi telemetry adapter) @@ -39,9 +39,9 @@ Install the [QGroundControl Daily Build](../dev_setup/qgc_daily_build.md) for a To configure the vehicle: 1. [Install PX4 firmware](../config/firmware.md#installing-px4-main-beta-or-custom-firmware) (including "custom" firmware with your own changes). -1. [Start with the airframe](../config/airframe.md) that best-matches your vehicle from the [airframe reference](../airframes/airframe_reference.md). -1. [Basic Configuration](../config/index.md) explains how to perform basic configuration. -1. [Parameter Configuration](../advanced_config/parameters.md) explains how you can find and modify individual parameters. +2. [Start with the airframe](../config/airframe.md) that best-matches your vehicle from the [airframe reference](../airframes/airframe_reference.md). +3. [Basic Configuration](../config/index.md) explains how to perform basic configuration. +4. [Parameter Configuration](../advanced_config/parameters.md) explains how you can find and modify individual parameters. ::: info diff --git a/docs/en/dev_setup/dev_env.md b/docs/en/dev_setup/dev_env.md index b57ab037c0..5d4810e00a 100644 --- a/docs/en/dev_setup/dev_env.md +++ b/docs/en/dev_setup/dev_env.md @@ -2,7 +2,7 @@ The _supported platforms_ for PX4 development are: -- [Ubuntu Linux (24.04/22.04)](../dev_setup/dev_env_linux_ubuntu.md) — Recommended +- [Ubuntu Linux (24.04/22.04)](../dev_setup/dev_env_linux_ubuntu.md) - [Windows (10/11)](../dev_setup/dev_env_windows_wsl.md) — via WSL2 - [macOS](../dev_setup/dev_env_mac.md) @@ -15,9 +15,9 @@ The table below shows what PX4 targets you can build on each OS. | **NuttX based hardware:** [Pixhawk Series](../flight_controller/pixhawk_series.md), [Crazyflie](../complete_vehicles_mc/crazyflie2.md) | ✓ | ✓ | ✓ | | **Linux-based hardware:** [Raspberry Pi 2/3](../flight_controller/raspberry_pi_navio2.md) | ✓ | | | | **Simulation:** [Gazebo SITL](../sim_gazebo_gz/index.md) | ✓ | ✓ | ✓ | -| **Simulation:** [Gazebo Classic SITL](../sim_gazebo_classic/index.md) | ✓ | ✓ | ✓ | -| **Simulation:** [ROS with Gazebo Classic](../simulation/ros_interface.md) | ✓ | | ✓ | | **Simulation:** ROS 2 with Gazebo | ✓ | | ✓ | +| **Simulation:** [Gazebo Classic SITL](../sim_gazebo_classic/index.md) | | ✓ | ✓ | +| **Simulation:** [ROS with Gazebo Classic](../simulation/ros_interface.md) | | | ✓ | Experienced Docker users can also build with the containers used by our continuous integration system: [Docker Containers](../test_and_ci/docker.md) diff --git a/docs/en/dev_setup/dev_env_windows_wsl.md b/docs/en/dev_setup/dev_env_windows_wsl.md index 92e0de4cbd..98e640124e 100644 --- a/docs/en/dev_setup/dev_env_windows_wsl.md +++ b/docs/en/dev_setup/dev_env_windows_wsl.md @@ -58,20 +58,20 @@ To install WSL2 with Ubuntu on a new installation of Windows 10 or 11: wsl --install ``` - - Ubuntu 20.04 ([Gazebo-Classic Simulation](../sim_gazebo_classic/index.md)) - - ```sh - wsl --install -d Ubuntu-20.04 - ``` - - Ubuntu 22.04 ([Gazebo Simulation](../sim_gazebo_gz/index.md)) ```sh wsl --install -d Ubuntu-22.04 ``` + - Ubuntu 24.04 ([Gazebo Simulation](../sim_gazebo_gz/index.md)) + + ```sh + wsl --install -d Ubuntu-24.04 + ``` + ::: info - You can also install[Ubuntu 20.04](https://www.microsoft.com/store/productId/9MTTCL66CPXJ) and [Ubuntu 22.04](https://www.microsoft.com/store/productId/9PN20MSR04DW) from the store, which allows you to delete the application using the normal Windows Add/Remove settings: + You can also [Ubuntu 24.04](https://www.microsoft.com/store/productId/9nz3klhxdjp5) or [Ubuntu 22.04](https://www.microsoft.com/store/productId/9PN20MSR04DW) from Microsoft Store, which allows you to delete the application using the normal Windows Add/Remove settings. ::: 1. WSL will prompt you for a user name and password for the Ubuntu installation. @@ -106,7 +106,7 @@ To open a WSL shell using a command prompt: ``` ```sh - wsl -d Ubuntu-20.04 + wsl -d Ubuntu-24.04 ``` If you only have one version of Ubuntu, you can just use `wsl`. diff --git a/docs/en/ros/mavros_installation.md b/docs/en/ros/mavros_installation.md index 0929b843df..b8c395e468 100644 --- a/docs/en/ros/mavros_installation.md +++ b/docs/en/ros/mavros_installation.md @@ -26,7 +26,7 @@ They cover the _ROS Melodic and Noetic_ releases. ::: tab ROS Noetic (Ubuntu 20.04) -If you're working with [ROS Noetic](https://wiki.ros.org/noetic) on Ubuntu 20.04: +If you're working with [ROS "Noetic"](https://wiki.ros.org/noetic) on Ubuntu 20.04: 1. Install PX4 without the simulator toolchain: 1. [Download PX4 Source Code](../dev_setup/building_px4.md): @@ -57,7 +57,7 @@ If you're working with [ROS Noetic](https://wiki.ros.org/noetic) on Ubuntu 20.04 ::: tab ROS Melodic (Ubuntu 18.04) -If you're working with ROS "Melodic on Ubuntu 18.04: +If you're working with ROS "Melodic" on Ubuntu 18.04: 1. Download the [ubuntu_sim_ros_melodic.sh](https://raw.githubusercontent.com/PX4/Devguide/master/build_scripts/ubuntu_sim_ros_melodic.sh) script in a bash shell: