Merge master into develop #648
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Apply clangformat * Add test sources * Test pep8 * Fix workflow * Fix workflow * Fix script * pep8 fixes * Cpp fixes * Remove ament pep257 & flake8 * Update urdf2webots submodule * Revert "Update urdf2webots submodule" This reverts commit fa45543. * Revert "Remove ament pep257 & flake8" This reverts commit 92df8a3. * Revert "Cpp fixes" This reverts commit c3a497c. * Revert "pep8 fixes" This reverts commit 141b0c8. * Revert "Revert "pep8 fixes"" This reverts commit ad007a4. * Test * Revert "Test" This reverts commit 25934ef. * Revert "Revert "Cpp fixes"" This reverts commit 8462d81. * Revert "Revert "Remove ament pep257 & flake8"" This reverts commit c689352. * Revert "Revert "Update urdf2webots submodule"" This reverts commit e2ed2b3. * Order fixes * Skip submodule tests * Finalize
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
* Add macOS copy * remove host * Update changelogs
* webots launcher creates supervisor if needed * Update launch files * minor fix * Update changelogs
* add wsl and macos urdfpath edit * Better path manipulation in supervisor * fix package names in yalm and xacro * Fix resources copy and prefix * Fix directory split * Update wsl * fix wsl * Update changelogs * cleanup * fix sources * Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py Co-authored-by: ad-daniel <[email protected]> * Update ros2_supervisor.py * clear trailing whitespace * Update changelog --------- Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
* adding possibility to select stream type * Update webots_ros2_driver/webots_ros2_driver/webots_launcher.py Co-authored-by: Olivier Michel <[email protected]> --------- Co-authored-by: Sebastian Ohl <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: ad-daniel <[email protected]> Co-authored-by: Yannick Goumaz <[email protected]>
* Restore tiago and epuck_tools tests * Update ci_after_init.bash * Update ci_after_init.bash * permissions * Increase timeout --------- Co-authored-by: Your Name <[email protected]>
…her.py (#639) * adding possibility to select stream type * Update webots_ros2_driver/webots_ros2_driver/webots_launcher.py Co-authored-by: Olivier Michel <[email protected]> * adding port parameter to launcher, also adding the copy of the world project file if it exists * fix code style * fix code style no2 * adding wbproj file to shared folder for mac users, adding port to controller_url_prefix * Update webots_ros2_driver/webots_ros2_driver/webots_launcher.py Co-authored-by: Olivier Michel <[email protected]> * Update webots_ros2_driver/webots_ros2_driver/utils.py Co-authored-by: Olivier Michel <[email protected]> * adding changelog entries, adding port parameter to RosSupervisorLauncher call * Update webots_ros2_driver/CHANGELOG.rst with suggested changes Co-authored-by: Yannick Goumaz <[email protected]> * Update webots_ros2_driver/webots_ros2_driver/webots_launcher.py Co-authored-by: Yannick Goumaz <[email protected]> * Update changelog --------- Co-authored-by: Sebastian Ohl <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Sebastian Ohl <[email protected]> Co-authored-by: Yannick Goumaz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ditto.