Skip to content

Dev kth space lab world#1

Merged
Pedro-Roque merged 10 commits intomainfrom
dev-kth_space_lab_world
Jul 3, 2025
Merged

Dev kth space lab world#1
Pedro-Roque merged 10 commits intomainfrom
dev-kth_space_lab_world

Conversation

@E-Krantz
Copy link
Copy Markdown
Contributor

@E-Krantz E-Krantz commented Jun 4, 2025

This PR adds:

  • Gazebo-ROS2 Bridge to publish /namespace/odom from Gazebo instead of using vehicle_attitude and vehicle_local_position.
  • Launch files for optionally running sitl in PX4-Space's kth_space_lab world.

@E-Krantz E-Krantz requested a review from Pedro-Roque June 4, 2025 15:32
@E-Krantz E-Krantz self-assigned this Jun 4, 2025
@Pedro-Roque
Copy link
Copy Markdown
Member

Looks good to me, does this depend on any other PRs?

@E-Krantz
Copy link
Copy Markdown
Contributor Author

E-Krantz commented Jun 5, 2025

Partly.

sitl_single_agent_kth.launch.py and sitl_multi_agent_kth.launch.py depend on the kth_space_lab gazebo world, which will be PR.

The regular launch files sitl_single_agent.launch.py and sitl_multi_agent.launch.py will work without that PR, and px4.launch.py is updated to publish /namespace/odom using Gazebo-ROS2 bridge which uses ENU and mimics the mocap in the lab.

I could change it to only be a PR for the Gazebo-ROS2 bridge.

@Pedro-Roque
Copy link
Copy Markdown
Member

Either is fine, if you make the other PR we can get it merged in and then merge this one. Please tag the other PR here as a comment when you make it :)

Other than that, you mention to use /namespace/odom instead of the FMU ones. Is it optional?

maintainer_email='[email protected]',
description='simple SITL launch files for single- and multi-agent simulation of the ATMOS platform',
license='BSD 3-Clause',
tests_require=['pytest'],
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this removal?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe tests_require=['pytest'] is outdated in setuptools and therefore gives warnings when building. I think it should be changed to

extras_require={
    'test': ['pytest']
}

I'll verify and update it.

@E-Krantz
Copy link
Copy Markdown
Contributor Author

I will do a couple of updates to this PR. I'll let you know when it is ready for review and merge again.

@Pedro-Roque
Copy link
Copy Markdown
Member

Sounds good!

@E-Krantz
Copy link
Copy Markdown
Contributor Author

Okay, @Pedro-Roque, it is ready for review.

  • I changed the Gazebo-ROS bridge for odom to be an optional launch argument.
    • The Gazebo-ROS bridge is used in the new launch files: sitl_single_agent_kth.launch.py and sitl_multi_agent_kth.launch.py, where it is publishing to /namespace/odom from Gazebo to mimic the ROS2 odom topic from the mocap in the real lab.
    • The bridge is installed with e.g., sudo apt install ros-humble-ros-gzharmonic-bridge
  • sitl_single_agent_kth.launch.py and sitl_multi_agent_kth.launch.py target the KTH Space Lab world.
  • Replace deprecated tests_require with extras_require for pytest.

I have not changed any functionality of the original launch scripts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants