Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/nvidia/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "px4_roscon_25_wsl",
"name": "px4_roscon_25_nvidia",
"image": "dronecode/roscon-25-workshop:latest",
"forwardPorts": [8765],
"containerEnv": {
Expand Down
Binary file added docs/assets/foxglove_teleop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/qgc_param.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ INFO [commander] Ready for takeoff!

This is all you need to do to start the GZ + PX4 simulation, you can now takeoff!

## Next step (otional) - Link the simulation to ROS 2
## Next step (optional) - Link the simulation to ROS 2

With the simulation up an running, it is time to bridge ROS 2 with Gazebo and PX4.

Expand Down
12 changes: 5 additions & 7 deletions px4_roscon_25/precision_land_executor/CustomMode_v2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ void CustomWaypoints::loadParameters() {

void CustomWaypoints::onActivate() {
// Initialize waypoints
_trajectory_waypoints.push_back(Eigen::Vector3f(5.0f, 0.0f, -2.0f)); // Initial waypoint at home position
_trajectory_waypoints.push_back(Eigen::Vector3f(5.0f, 5.0f, -2.0f)); // Second waypoint
_trajectory_waypoints.push_back(Eigen::Vector3f(-5.0f, 5.0f, -2.0f)); // Third waypoint
_trajectory_waypoints.push_back(Eigen::Vector3f(-5.0f, -5.0f, -2.0f)); // Fourth waypoint
_trajectory_waypoints.push_back(Eigen::Vector3f(_local_position->positionNed().x(),
_local_position->positionNed().y(),
_local_position->positionNed().z())); // Final waypoint at current position
_trajectory_waypoints.push_back(Eigen::Vector3f(1.0f, 2.5f, -3.0f));
_trajectory_waypoints.push_back(Eigen::Vector3f(14.0f, 2.5f, -3.0f));
_trajectory_waypoints.push_back(Eigen::Vector3f(14.0f, 8.0f, -3.0f));
_trajectory_waypoints.push_back(Eigen::Vector3f(-4.0f, 8.0f, -3.0f));

_current_waypoint_index = 0; // Start at the first waypoint
RCLCPP_INFO(_node.get_logger(), "CustomWaypoints mode activated");
// Set initial trajectory setpoint
Expand Down
4 changes: 4 additions & 0 deletions px4_roscon_25/precision_land_executor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ The system:

## Usage

The current waypoints require a velocity limit, you can set it in QGC.

![QGC param](../../docs//assets/qgc_param.png)

1. Launch the common launchfile

```sh
Expand Down
4 changes: 4 additions & 0 deletions px4_roscon_25/teleop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ 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)

Your output should look like this:
![foxglove example](../../docs/assets/foxglove_teleop.png)


## Exercise

Navigate the drone to the target in Foxglove using teleoperation.
Expand Down