diff --git a/.devcontainer/linux/devcontainer.json b/.devcontainer/linux/devcontainer.json index d1edaf5..7bb3637 100644 --- a/.devcontainer/linux/devcontainer.json +++ b/.devcontainer/linux/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "px4_roscon_25_linux", + "name": "px4_roscon_workshop_linux", "image": "dronecode/roscon-25-workshop:latest", "forwardPorts": [8765], "remoteEnv": { diff --git a/.devcontainer/nogui/devcontainer.json b/.devcontainer/nogui/devcontainer.json index 45d863f..0c4fc93 100644 --- a/.devcontainer/nogui/devcontainer.json +++ b/.devcontainer/nogui/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "px4_roscon_25_nogui", + "name": "px4_roscon_workshop_nogui", "image": "dronecode/roscon-25-workshop:latest", "forwardPorts": [8765, 18570], "customizations": { diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json index a3a1b13..f9dfb88 100644 --- a/.devcontainer/nvidia/devcontainer.json +++ b/.devcontainer/nvidia/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "px4_roscon_25_nvidia", + "name": "px4_roscon_workshop_nvidia", "image": "dronecode/roscon-25-workshop:latest", "forwardPorts": [8765], "containerEnv": { diff --git a/README.md b/README.md index ac59c50..2866766 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ The goal is to compare these two approaches, highlighting their differences and For detailed instructions and exercises, refer to the following guides in this repository: -- [Offboard Demo](px4_roscon_25/offboard_demo/README.md) -- [Custom Mode Demo](px4_roscon_25/custom_mode_demo/README.md) +- [Offboard Demo](px4_roscon_workshop/offboard_demo/README.md) +- [Custom Mode Demo](px4_roscon_workshop/custom_mode_demo/README.md) ### Perception & Applications @@ -72,10 +72,10 @@ In this section, we explore **three practical examples** of perception and contr For more detailed instructions and exercises, refer to the following demos: -- [ArUco Marker Detection](px4_roscon_25/aruco_tracker/README.md) -- [Teleoperation](px4_roscon_25/teleop/README.md) -- [Precision Landing](px4_roscon_25/precision_land/README.md) -- [Precision Landing with Executor](px4_roscon_25/precision_land_executor/README.md) +- [ArUco Marker Detection](px4_roscon_workshop/aruco_tracker/README.md) +- [Teleoperation](px4_roscon_workshop/teleop/README.md) +- [Precision Landing](px4_roscon_workshop/precision_land/README.md) +- [Precision Landing with Executor](px4_roscon_workshop/precision_land_executor/README.md) ### Q&A, Resources & Hardware Show-and-Tell diff --git a/docs/setup.md b/docs/setup.md index fa253e9..7269e4f 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -258,7 +258,7 @@ This is all you need to do to start the GZ + PX4 simulation, you can now takeoff With the simulation up an running, it is time to bridge ROS 2 with Gazebo and PX4. The following sections will demo the essential steps in this process. -However, when trying the exercises you can leverage the [common launchfile](../px4_roscon_25/px4_roscon_25/README.md) which automatically sets up the required bridges. +However, when trying the exercises you can leverage the [common launchfile](../px4_roscon_workshop/px4_roscon_workshop/README.md) which automatically sets up the required bridges. 1. **Clock bridging.** We want to leverage the GZ clock and use it to time all our ROS 2 node. This is accomplished by first creating an unidirectional bridge between the gz `/clock` topic and the ROS 2 one and then by commanding all ROS 2 to use the newly created `/clock` ROS 2 topic as time reference. @@ -326,7 +326,7 @@ accelerometer_integral_dt: 4000 ### Foxglove visualization -You can use the [px4_tf](../px4_roscon_25/px4_tf/README.md) packages, in conjunction with `foxglove_bridge` to visualize in 3D the drone `base_link`. +You can use the [px4_tf](../px4_roscon_workshop/px4_tf/README.md) packages, in conjunction with `foxglove_bridge` to visualize in 3D the drone `base_link`. The `px4_tf_publisher` node subscribes to PX4 `/fmu/out/vehicle_odometry` topic and publishes a derived transform for the `odom` frame to the `base_link` frame. diff --git a/px4_roscon_25/aruco_tracker/ArucoTracker.cpp b/px4_roscon_workshop/aruco_tracker/ArucoTracker.cpp similarity index 100% rename from px4_roscon_25/aruco_tracker/ArucoTracker.cpp rename to px4_roscon_workshop/aruco_tracker/ArucoTracker.cpp diff --git a/px4_roscon_25/aruco_tracker/ArucoTracker.hpp b/px4_roscon_workshop/aruco_tracker/ArucoTracker.hpp similarity index 100% rename from px4_roscon_25/aruco_tracker/ArucoTracker.hpp rename to px4_roscon_workshop/aruco_tracker/ArucoTracker.hpp diff --git a/px4_roscon_25/aruco_tracker/CMakeLists.txt b/px4_roscon_workshop/aruco_tracker/CMakeLists.txt similarity index 100% rename from px4_roscon_25/aruco_tracker/CMakeLists.txt rename to px4_roscon_workshop/aruco_tracker/CMakeLists.txt diff --git a/px4_roscon_25/aruco_tracker/README.md b/px4_roscon_workshop/aruco_tracker/README.md similarity index 96% rename from px4_roscon_25/aruco_tracker/README.md rename to px4_roscon_workshop/aruco_tracker/README.md index 470a1c3..6a3580a 100644 --- a/px4_roscon_25/aruco_tracker/README.md +++ b/px4_roscon_workshop/aruco_tracker/README.md @@ -30,10 +30,10 @@ When the simulation is running you can see the GZ topics: gz topic -l ``` -You can now launch the [common](../px4_roscon_25/README.md) launchfile +You can now launch the [common](../px4_roscon_workshop/README.md) launchfile ```sh -ros2 launch px4_roscon_25 common.launch.py +ros2 launch px4_roscon_workshop common.launch.py ``` and then the ArUco tracker launchfile. diff --git a/px4_roscon_25/aruco_tracker/cfg/bridge.yaml b/px4_roscon_workshop/aruco_tracker/cfg/bridge.yaml similarity index 100% rename from px4_roscon_25/aruco_tracker/cfg/bridge.yaml rename to px4_roscon_workshop/aruco_tracker/cfg/bridge.yaml diff --git a/px4_roscon_25/aruco_tracker/cfg/params.yaml b/px4_roscon_workshop/aruco_tracker/cfg/params.yaml similarity index 100% rename from px4_roscon_25/aruco_tracker/cfg/params.yaml rename to px4_roscon_workshop/aruco_tracker/cfg/params.yaml diff --git a/px4_roscon_25/aruco_tracker/launch/aruco_tracker.launch.py b/px4_roscon_workshop/aruco_tracker/launch/aruco_tracker.launch.py similarity index 100% rename from px4_roscon_25/aruco_tracker/launch/aruco_tracker.launch.py rename to px4_roscon_workshop/aruco_tracker/launch/aruco_tracker.launch.py diff --git a/px4_roscon_25/aruco_tracker/package.xml b/px4_roscon_workshop/aruco_tracker/package.xml similarity index 100% rename from px4_roscon_25/aruco_tracker/package.xml rename to px4_roscon_workshop/aruco_tracker/package.xml diff --git a/px4_roscon_25/custom_mode_demo/CMakeLists.txt b/px4_roscon_workshop/custom_mode_demo/CMakeLists.txt similarity index 100% rename from px4_roscon_25/custom_mode_demo/CMakeLists.txt rename to px4_roscon_workshop/custom_mode_demo/CMakeLists.txt diff --git a/px4_roscon_25/custom_mode_demo/CustomMode.cpp b/px4_roscon_workshop/custom_mode_demo/CustomMode.cpp similarity index 100% rename from px4_roscon_25/custom_mode_demo/CustomMode.cpp rename to px4_roscon_workshop/custom_mode_demo/CustomMode.cpp diff --git a/px4_roscon_25/custom_mode_demo/CustomMode.hpp b/px4_roscon_workshop/custom_mode_demo/CustomMode.hpp similarity index 100% rename from px4_roscon_25/custom_mode_demo/CustomMode.hpp rename to px4_roscon_workshop/custom_mode_demo/CustomMode.hpp diff --git a/px4_roscon_25/custom_mode_demo/CustomModeExecutor.cpp b/px4_roscon_workshop/custom_mode_demo/CustomModeExecutor.cpp similarity index 100% rename from px4_roscon_25/custom_mode_demo/CustomModeExecutor.cpp rename to px4_roscon_workshop/custom_mode_demo/CustomModeExecutor.cpp diff --git a/px4_roscon_25/custom_mode_demo/CustomModeExecutor.hpp b/px4_roscon_workshop/custom_mode_demo/CustomModeExecutor.hpp similarity index 100% rename from px4_roscon_25/custom_mode_demo/CustomModeExecutor.hpp rename to px4_roscon_workshop/custom_mode_demo/CustomModeExecutor.hpp diff --git a/px4_roscon_25/custom_mode_demo/README.md b/px4_roscon_workshop/custom_mode_demo/README.md similarity index 96% rename from px4_roscon_25/custom_mode_demo/README.md rename to px4_roscon_workshop/custom_mode_demo/README.md index c6f4212..9a8996c 100644 --- a/px4_roscon_25/custom_mode_demo/README.md +++ b/px4_roscon_workshop/custom_mode_demo/README.md @@ -31,10 +31,10 @@ The demo executes the following autonomous sequence: ## Usage 1. Start the simulation, PX4 and QGC as described in the [setup guide](../../docs/setup.md). -2. Start the additional ROS 2 node through the [common launchfile](../px4_roscon_25/README.md) +2. Start the additional ROS 2 node through the [common launchfile](../px4_roscon_workshop/README.md) ```sh - ros2 launch px4_roscon_25 common.launch.py + ros2 launch px4_roscon_workshop common.launch.py ``` 3. Run `custom_mode_demo.launch.py` from inside the docker container diff --git a/px4_roscon_25/custom_mode_demo/cfg/clock_bridge.yaml b/px4_roscon_workshop/custom_mode_demo/cfg/clock_bridge.yaml similarity index 100% rename from px4_roscon_25/custom_mode_demo/cfg/clock_bridge.yaml rename to px4_roscon_workshop/custom_mode_demo/cfg/clock_bridge.yaml diff --git a/px4_roscon_25/custom_mode_demo/launch/custom_mode_demo.launch.py b/px4_roscon_workshop/custom_mode_demo/launch/custom_mode_demo.launch.py similarity index 100% rename from px4_roscon_25/custom_mode_demo/launch/custom_mode_demo.launch.py rename to px4_roscon_workshop/custom_mode_demo/launch/custom_mode_demo.launch.py diff --git a/px4_roscon_25/custom_mode_demo/package.xml b/px4_roscon_workshop/custom_mode_demo/package.xml similarity index 100% rename from px4_roscon_25/custom_mode_demo/package.xml rename to px4_roscon_workshop/custom_mode_demo/package.xml diff --git a/px4_roscon_25/offboard_demo/CMakeLists.txt b/px4_roscon_workshop/offboard_demo/CMakeLists.txt similarity index 100% rename from px4_roscon_25/offboard_demo/CMakeLists.txt rename to px4_roscon_workshop/offboard_demo/CMakeLists.txt diff --git a/px4_roscon_25/offboard_demo/OffboardDemo.cpp b/px4_roscon_workshop/offboard_demo/OffboardDemo.cpp similarity index 100% rename from px4_roscon_25/offboard_demo/OffboardDemo.cpp rename to px4_roscon_workshop/offboard_demo/OffboardDemo.cpp diff --git a/px4_roscon_25/offboard_demo/OffboardDemo.hpp b/px4_roscon_workshop/offboard_demo/OffboardDemo.hpp similarity index 100% rename from px4_roscon_25/offboard_demo/OffboardDemo.hpp rename to px4_roscon_workshop/offboard_demo/OffboardDemo.hpp diff --git a/px4_roscon_25/offboard_demo/README.md b/px4_roscon_workshop/offboard_demo/README.md similarity index 95% rename from px4_roscon_25/offboard_demo/README.md rename to px4_roscon_workshop/offboard_demo/README.md index f1d04f6..9c86628 100644 --- a/px4_roscon_25/offboard_demo/README.md +++ b/px4_roscon_workshop/offboard_demo/README.md @@ -17,10 +17,10 @@ The Offboard Demo implements a state-based flight controller that executes the f ## Usage 1. Start the simulation, PX4 and QGC as described in the [setup guide](../../docs/setup.md). -2. Start the additional ROS 2 node through the [common launchfile](../px4_roscon_25/README.md). +2. Start the additional ROS 2 node through the [common launchfile](../px4_roscon_workshop/README.md). ```sh - ros2 launch px4_roscon_25 common.launch.py + ros2 launch px4_roscon_workshop common.launch.py ``` 3. Run `offboard_demo.launch.py` from inside the docker container diff --git a/px4_roscon_25/offboard_demo/cfg/clock_bridge.yaml b/px4_roscon_workshop/offboard_demo/cfg/clock_bridge.yaml similarity index 100% rename from px4_roscon_25/offboard_demo/cfg/clock_bridge.yaml rename to px4_roscon_workshop/offboard_demo/cfg/clock_bridge.yaml diff --git a/px4_roscon_25/offboard_demo/launch/offboard_demo.launch.py b/px4_roscon_workshop/offboard_demo/launch/offboard_demo.launch.py similarity index 100% rename from px4_roscon_25/offboard_demo/launch/offboard_demo.launch.py rename to px4_roscon_workshop/offboard_demo/launch/offboard_demo.launch.py diff --git a/px4_roscon_25/offboard_demo/package.xml b/px4_roscon_workshop/offboard_demo/package.xml similarity index 100% rename from px4_roscon_25/offboard_demo/package.xml rename to px4_roscon_workshop/offboard_demo/package.xml diff --git a/px4_roscon_25/precision_land/CMakeLists.txt b/px4_roscon_workshop/precision_land/CMakeLists.txt similarity index 100% rename from px4_roscon_25/precision_land/CMakeLists.txt rename to px4_roscon_workshop/precision_land/CMakeLists.txt diff --git a/px4_roscon_25/precision_land/PrecisionLand.cpp b/px4_roscon_workshop/precision_land/PrecisionLand.cpp similarity index 100% rename from px4_roscon_25/precision_land/PrecisionLand.cpp rename to px4_roscon_workshop/precision_land/PrecisionLand.cpp diff --git a/px4_roscon_25/precision_land/PrecisionLand.hpp b/px4_roscon_workshop/precision_land/PrecisionLand.hpp similarity index 100% rename from px4_roscon_25/precision_land/PrecisionLand.hpp rename to px4_roscon_workshop/precision_land/PrecisionLand.hpp diff --git a/px4_roscon_25/precision_land/README.md b/px4_roscon_workshop/precision_land/README.md similarity index 100% rename from px4_roscon_25/precision_land/README.md rename to px4_roscon_workshop/precision_land/README.md diff --git a/px4_roscon_25/precision_land/package.xml b/px4_roscon_workshop/precision_land/package.xml similarity index 100% rename from px4_roscon_25/precision_land/package.xml rename to px4_roscon_workshop/precision_land/package.xml diff --git a/px4_roscon_25/precision_land_executor/CMakeLists.txt b/px4_roscon_workshop/precision_land_executor/CMakeLists.txt similarity index 100% rename from px4_roscon_25/precision_land_executor/CMakeLists.txt rename to px4_roscon_workshop/precision_land_executor/CMakeLists.txt diff --git a/px4_roscon_25/precision_land_executor/CustomModeExecutor_v2.cpp b/px4_roscon_workshop/precision_land_executor/CustomModeExecutor_v2.cpp similarity index 100% rename from px4_roscon_25/precision_land_executor/CustomModeExecutor_v2.cpp rename to px4_roscon_workshop/precision_land_executor/CustomModeExecutor_v2.cpp diff --git a/px4_roscon_25/precision_land_executor/CustomModeExecutor_v2.hpp b/px4_roscon_workshop/precision_land_executor/CustomModeExecutor_v2.hpp similarity index 100% rename from px4_roscon_25/precision_land_executor/CustomModeExecutor_v2.hpp rename to px4_roscon_workshop/precision_land_executor/CustomModeExecutor_v2.hpp diff --git a/px4_roscon_25/precision_land_executor/CustomMode_v2.cpp b/px4_roscon_workshop/precision_land_executor/CustomMode_v2.cpp similarity index 100% rename from px4_roscon_25/precision_land_executor/CustomMode_v2.cpp rename to px4_roscon_workshop/precision_land_executor/CustomMode_v2.cpp diff --git a/px4_roscon_25/precision_land_executor/CustomMode_v2.hpp b/px4_roscon_workshop/precision_land_executor/CustomMode_v2.hpp similarity index 100% rename from px4_roscon_25/precision_land_executor/CustomMode_v2.hpp rename to px4_roscon_workshop/precision_land_executor/CustomMode_v2.hpp diff --git a/px4_roscon_25/precision_land_executor/README.md b/px4_roscon_workshop/precision_land_executor/README.md similarity index 98% rename from px4_roscon_25/precision_land_executor/README.md rename to px4_roscon_workshop/precision_land_executor/README.md index e166265..d87bbf9 100644 --- a/px4_roscon_25/precision_land_executor/README.md +++ b/px4_roscon_workshop/precision_land_executor/README.md @@ -57,7 +57,7 @@ The current waypoints require a velocity limit, you can set it in QGC. 1. Launch the common launchfile ```sh - ros2 launch px4_roscon_25 common.launch.py + ros2 launch px4_roscon_workshop common.launch.py ``` 2. Start the ArUco tracker node: diff --git a/px4_roscon_25/precision_land_executor/cfg/clock_bridge.yaml b/px4_roscon_workshop/precision_land_executor/cfg/clock_bridge.yaml similarity index 100% rename from px4_roscon_25/precision_land_executor/cfg/clock_bridge.yaml rename to px4_roscon_workshop/precision_land_executor/cfg/clock_bridge.yaml diff --git a/px4_roscon_25/precision_land_executor/launch/precision_land_executor.launch.py b/px4_roscon_workshop/precision_land_executor/launch/precision_land_executor.launch.py similarity index 100% rename from px4_roscon_25/precision_land_executor/launch/precision_land_executor.launch.py rename to px4_roscon_workshop/precision_land_executor/launch/precision_land_executor.launch.py diff --git a/px4_roscon_25/precision_land_executor/package.xml b/px4_roscon_workshop/precision_land_executor/package.xml similarity index 100% rename from px4_roscon_25/precision_land_executor/package.xml rename to px4_roscon_workshop/precision_land_executor/package.xml diff --git a/px4_roscon_25/px4_roscon_25/CMakeLists.txt b/px4_roscon_workshop/px4_roscon_workshop/CMakeLists.txt similarity index 97% rename from px4_roscon_25/px4_roscon_25/CMakeLists.txt rename to px4_roscon_workshop/px4_roscon_workshop/CMakeLists.txt index b338837..977f2ff 100644 --- a/px4_roscon_25/px4_roscon_25/CMakeLists.txt +++ b/px4_roscon_workshop/px4_roscon_workshop/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(px4_roscon_25) +project(px4_roscon_workshop) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/px4_roscon_25/px4_roscon_25/README.md b/px4_roscon_workshop/px4_roscon_workshop/README.md similarity index 95% rename from px4_roscon_25/px4_roscon_25/README.md rename to px4_roscon_workshop/px4_roscon_workshop/README.md index 08a52ce..7915a63 100644 --- a/px4_roscon_25/px4_roscon_25/README.md +++ b/px4_roscon_workshop/px4_roscon_workshop/README.md @@ -5,7 +5,7 @@ This package contains a launchfile to simplify the simulations startup. To use it, run ```sh -ros2 launch px4_roscon_25 common.launch.py +ros2 launch px4_roscon_workshop common.launch.py ``` The launchfile will diff --git a/px4_roscon_25/px4_roscon_25/cfg/clock_bridge.yaml b/px4_roscon_workshop/px4_roscon_workshop/cfg/clock_bridge.yaml similarity index 100% rename from px4_roscon_25/px4_roscon_25/cfg/clock_bridge.yaml rename to px4_roscon_workshop/px4_roscon_workshop/cfg/clock_bridge.yaml diff --git a/px4_roscon_25/px4_roscon_25/launch/common.launch.py b/px4_roscon_workshop/px4_roscon_workshop/launch/common.launch.py similarity index 96% rename from px4_roscon_25/px4_roscon_25/launch/common.launch.py rename to px4_roscon_workshop/px4_roscon_workshop/launch/common.launch.py index 392ec16..ce3a2cb 100644 --- a/px4_roscon_25/px4_roscon_25/launch/common.launch.py +++ b/px4_roscon_workshop/px4_roscon_workshop/launch/common.launch.py @@ -8,7 +8,7 @@ def generate_launch_description(): - pkg_share = FindPackageShare('px4_roscon_25').find('px4_roscon_25') + pkg_share = FindPackageShare('px4_roscon_workshop').find('px4_roscon_workshop') clock_bridge_config_file = os.path.join(pkg_share,"cfg","clock_bridge.yaml") diff --git a/px4_roscon_25/px4_roscon_25/meshes/1345_prop_ccw.stl b/px4_roscon_workshop/px4_roscon_workshop/meshes/1345_prop_ccw.stl similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/1345_prop_ccw.stl rename to px4_roscon_workshop/px4_roscon_workshop/meshes/1345_prop_ccw.stl diff --git a/px4_roscon_25/px4_roscon_25/meshes/1345_prop_cw.stl b/px4_roscon_workshop/px4_roscon_workshop/meshes/1345_prop_cw.stl similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/1345_prop_cw.stl rename to px4_roscon_workshop/px4_roscon_workshop/meshes/1345_prop_cw.stl diff --git a/px4_roscon_25/px4_roscon_25/meshes/5010Base.dae b/px4_roscon_workshop/px4_roscon_workshop/meshes/5010Base.dae similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/5010Base.dae rename to px4_roscon_workshop/px4_roscon_workshop/meshes/5010Base.dae diff --git a/px4_roscon_25/px4_roscon_25/meshes/5010Bell.dae b/px4_roscon_workshop/px4_roscon_workshop/meshes/5010Bell.dae similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/5010Bell.dae rename to px4_roscon_workshop/px4_roscon_workshop/meshes/5010Bell.dae diff --git a/px4_roscon_25/px4_roscon_25/meshes/CF.png b/px4_roscon_workshop/px4_roscon_workshop/meshes/CF.png similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/CF.png rename to px4_roscon_workshop/px4_roscon_workshop/meshes/CF.png diff --git a/px4_roscon_25/px4_roscon_25/meshes/NXP-HGD-CF.dae b/px4_roscon_workshop/px4_roscon_workshop/meshes/NXP-HGD-CF.dae similarity index 100% rename from px4_roscon_25/px4_roscon_25/meshes/NXP-HGD-CF.dae rename to px4_roscon_workshop/px4_roscon_workshop/meshes/NXP-HGD-CF.dae diff --git a/px4_roscon_25/px4_roscon_25/package.xml b/px4_roscon_workshop/px4_roscon_workshop/package.xml similarity index 96% rename from px4_roscon_25/px4_roscon_25/package.xml rename to px4_roscon_workshop/px4_roscon_workshop/package.xml index fb4300c..8572286 100644 --- a/px4_roscon_25/px4_roscon_25/package.xml +++ b/px4_roscon_workshop/px4_roscon_workshop/package.xml @@ -1,7 +1,7 @@ - px4_roscon_25 + px4_roscon_workshop 0.0.1 Utility package to facilitate communication between PX4 and ROS 2 ubuntu diff --git a/px4_roscon_25/px4_roscon_25/urdf/x500.urdf b/px4_roscon_workshop/px4_roscon_workshop/urdf/x500.urdf similarity index 75% rename from px4_roscon_25/px4_roscon_25/urdf/x500.urdf rename to px4_roscon_workshop/px4_roscon_workshop/urdf/x500.urdf index 223c378..b5b4b97 100644 --- a/px4_roscon_25/px4_roscon_25/urdf/x500.urdf +++ b/px4_roscon_workshop/px4_roscon_workshop/urdf/x500.urdf @@ -4,31 +4,31 @@ - + - + - + - + - + @@ -37,14 +37,14 @@ - + --> - + @@ -58,14 +58,14 @@ - + --> - + @@ -79,14 +79,14 @@ - + --> - + @@ -100,14 +100,14 @@ - + --> - + diff --git a/px4_roscon_25/px4_tf/CMakeLists.txt b/px4_roscon_workshop/px4_tf/CMakeLists.txt similarity index 100% rename from px4_roscon_25/px4_tf/CMakeLists.txt rename to px4_roscon_workshop/px4_tf/CMakeLists.txt diff --git a/px4_roscon_25/px4_tf/README.md b/px4_roscon_workshop/px4_tf/README.md similarity index 100% rename from px4_roscon_25/px4_tf/README.md rename to px4_roscon_workshop/px4_tf/README.md diff --git a/px4_roscon_25/px4_tf/docs/single_drone.png b/px4_roscon_workshop/px4_tf/docs/single_drone.png similarity index 100% rename from px4_roscon_25/px4_tf/docs/single_drone.png rename to px4_roscon_workshop/px4_tf/docs/single_drone.png diff --git a/px4_roscon_25/px4_tf/docs/two_drones.png b/px4_roscon_workshop/px4_tf/docs/two_drones.png similarity index 100% rename from px4_roscon_25/px4_tf/docs/two_drones.png rename to px4_roscon_workshop/px4_tf/docs/two_drones.png diff --git a/px4_roscon_25/px4_tf/include/px4_tf/px4_tf_publisher_node.hpp b/px4_roscon_workshop/px4_tf/include/px4_tf/px4_tf_publisher_node.hpp similarity index 100% rename from px4_roscon_25/px4_tf/include/px4_tf/px4_tf_publisher_node.hpp rename to px4_roscon_workshop/px4_tf/include/px4_tf/px4_tf_publisher_node.hpp diff --git a/px4_roscon_25/px4_tf/package.xml b/px4_roscon_workshop/px4_tf/package.xml similarity index 100% rename from px4_roscon_25/px4_tf/package.xml rename to px4_roscon_workshop/px4_tf/package.xml diff --git a/px4_roscon_25/px4_tf/src/px4_tf_publisher.cpp b/px4_roscon_workshop/px4_tf/src/px4_tf_publisher.cpp similarity index 100% rename from px4_roscon_25/px4_tf/src/px4_tf_publisher.cpp rename to px4_roscon_workshop/px4_tf/src/px4_tf_publisher.cpp diff --git a/px4_roscon_25/px4_tf/src/px4_tf_publisher_node.cpp b/px4_roscon_workshop/px4_tf/src/px4_tf_publisher_node.cpp similarity index 100% rename from px4_roscon_25/px4_tf/src/px4_tf_publisher_node.cpp rename to px4_roscon_workshop/px4_tf/src/px4_tf_publisher_node.cpp diff --git a/px4_roscon_25/teleop/CMakeLists.txt b/px4_roscon_workshop/teleop/CMakeLists.txt similarity index 100% rename from px4_roscon_25/teleop/CMakeLists.txt rename to px4_roscon_workshop/teleop/CMakeLists.txt diff --git a/px4_roscon_25/teleop/README.md b/px4_roscon_workshop/teleop/README.md similarity index 90% rename from px4_roscon_25/teleop/README.md rename to px4_roscon_workshop/teleop/README.md index e59a734..1a35c98 100644 --- a/px4_roscon_25/teleop/README.md +++ b/px4_roscon_workshop/teleop/README.md @@ -27,10 +27,10 @@ When the simulation is running you can see the GZ topics: gz topic -l ``` -You can now launch the [common](../px4_roscon_25/README.md) launchfile +You can now launch the [common](../px4_roscon_workshop/README.md) launchfile ```sh -ros2 launch px4_roscon_25 common.launch.py +ros2 launch px4_roscon_workshop common.launch.py ``` and finally the `teleop` launchfile and the _keyboard_monitor_ node. @@ -44,7 +44,7 @@ ros2 run teleop_twist_rpyt_keyboard teleop_twist_rpyt_keyboard ``` Just like in the Custom Mode demo, the teleop one requires you to manually activate it and arm the drone! -Make sure you launch the maze in Foxglove, more details see [Foxglove Instructions](../px4_roscon_25/README.md) +Make sure you launch the maze in Foxglove, more details see [Foxglove Instructions](../px4_roscon_workshop/README.md) Your output should look like this: ![foxglove example](../../docs/assets/foxglove_teleop.png) diff --git a/px4_roscon_25/teleop/Teleop.cpp b/px4_roscon_workshop/teleop/Teleop.cpp similarity index 100% rename from px4_roscon_25/teleop/Teleop.cpp rename to px4_roscon_workshop/teleop/Teleop.cpp diff --git a/px4_roscon_25/teleop/Teleop.hpp b/px4_roscon_workshop/teleop/Teleop.hpp similarity index 100% rename from px4_roscon_25/teleop/Teleop.hpp rename to px4_roscon_workshop/teleop/Teleop.hpp diff --git a/px4_roscon_25/teleop/TeleopExecutor.cpp b/px4_roscon_workshop/teleop/TeleopExecutor.cpp similarity index 100% rename from px4_roscon_25/teleop/TeleopExecutor.cpp rename to px4_roscon_workshop/teleop/TeleopExecutor.cpp diff --git a/px4_roscon_25/teleop/TeleopExecutor.hpp b/px4_roscon_workshop/teleop/TeleopExecutor.hpp similarity index 100% rename from px4_roscon_25/teleop/TeleopExecutor.hpp rename to px4_roscon_workshop/teleop/TeleopExecutor.hpp diff --git a/px4_roscon_25/teleop/cfg/bridge.yaml b/px4_roscon_workshop/teleop/cfg/bridge.yaml similarity index 100% rename from px4_roscon_25/teleop/cfg/bridge.yaml rename to px4_roscon_workshop/teleop/cfg/bridge.yaml diff --git a/px4_roscon_25/teleop/cfg/params.yaml b/px4_roscon_workshop/teleop/cfg/params.yaml similarity index 100% rename from px4_roscon_25/teleop/cfg/params.yaml rename to px4_roscon_workshop/teleop/cfg/params.yaml diff --git a/px4_roscon_25/teleop/launch/teleop.launch.py b/px4_roscon_workshop/teleop/launch/teleop.launch.py similarity index 100% rename from px4_roscon_25/teleop/launch/teleop.launch.py rename to px4_roscon_workshop/teleop/launch/teleop.launch.py diff --git a/px4_roscon_25/teleop/package.xml b/px4_roscon_workshop/teleop/package.xml similarity index 100% rename from px4_roscon_25/teleop/package.xml rename to px4_roscon_workshop/teleop/package.xml diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/README.md b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/README.md similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/README.md rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/README.md diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/package.xml b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/package.xml similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/package.xml rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/package.xml diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/resource/teleop_twist_rpyt_keyboard b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/resource/teleop_twist_rpyt_keyboard similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/resource/teleop_twist_rpyt_keyboard rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/resource/teleop_twist_rpyt_keyboard diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/setup.cfg b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/setup.cfg similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/setup.cfg rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/setup.cfg diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/setup.py b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/setup.py similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/setup.py rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/setup.py diff --git a/px4_roscon_25/teleop_twist_rpyt_keyboard/teleop_twist_rpyt_keyboard.py b/px4_roscon_workshop/teleop_twist_rpyt_keyboard/teleop_twist_rpyt_keyboard.py similarity index 100% rename from px4_roscon_25/teleop_twist_rpyt_keyboard/teleop_twist_rpyt_keyboard.py rename to px4_roscon_workshop/teleop_twist_rpyt_keyboard/teleop_twist_rpyt_keyboard.py