Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moving gz into submodule #22437

Closed
wants to merge 3 commits into from
Closed

Conversation

frede791
Copy link
Contributor

@frede791 frede791 commented Nov 23, 2023

Striving for greater autonomy between PX4 and Gazebo, this PR moves gazebo models and worlds into their own repository and adds them as a submodule in PX4. This is another step in separating PX4 and Gazebo. Furthermore, this PR moves the tools folder from the /simulation/gz/ folder to the /simulation folder in order to not need it to import it as well.

Solution

Moving gz models and worlds to their own submodule for greater autonomy.

Signed-off-by: frederik <frederik@auterion.com>
@frede791
Copy link
Contributor Author

@dagar Let me know what you think of this. This is another step in moving Gazebo models away from PX4.
There are still some cmake warnings being thrown being building so I will work on fixing those before marking this PR as ready for review.

.gitmodules Outdated Show resolved Hide resolved
@DronecodeBot
Copy link

This pull request has been mentioned on Discussion Forum for PX4, Pixhawk, QGroundControl, MAVSDK, MAVLink. There might be relevant details there:

https://discuss.px4.io/t/px4-maintainers-call-november-28-2023/35555/1

@dagar
Copy link
Member

dagar commented Nov 28, 2023

Can you have cmake add the submodule so that it doesn't need to be manually initialized?

px4_add_git_submodule(TARGET git_flightgear_bridge PATH "${PX4_SOURCE_DIR}/Tools/simulation/flightgear/flightgear_bridge")

Place it here so that it's only initialized if gz_bridge is in the build.

https://github.com/PX4/PX4-Autopilot/blob/main/src/modules/simulation/gz_bridge/CMakeLists.txt

frede791 and others added 2 commits November 29, 2023 09:26
Co-authored-by: Daniel Agar <daniel@agar.ca>
Signed-off-by: frederik <frederik@auterion.com>
@frede791
Copy link
Contributor Author

frede791 commented Dec 1, 2023

@dagar amended Cmake to auto initialize the gz submodule

@frede791 frede791 marked this pull request as ready for review December 1, 2023 10:45
@frede791 frede791 requested a review from dagar December 1, 2023 10:45
@frede791 frede791 marked this pull request as draft December 6, 2023 10:41
@frede791 frede791 mentioned this pull request Dec 6, 2023
@frede791
Copy link
Contributor Author

has been made redundant by #22467 and can therefore be closed.

@frede791 frede791 closed this Dec 18, 2023
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.

None yet

3 participants