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.

Sign up for GitHub

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

Jump to bottom

Merge develop into master #779

Merged
merged 94 commits into from
Jun 19, 2023
Merged

Merge develop into master #779

merged 94 commits into from
Jun 19, 2023

Conversation

ygoumaz
Copy link
Contributor

@ygoumaz ygoumaz commented Jun 19, 2023 •
edited
Loading

For Webots R2023b release.

No conflicts.

github-actions bot and others added 30 commits November 1, 2022 09:33
@github-actions
Sync submodule (#501)
de3f8cb 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#507)
891294a 
Co-authored-by: ad-daniel <[email protected]>
@ygoumaz @github-actions
@stefaniapedrazzi @omichel @lukicdarkoo @ad-daniel @AKreutz
Merge master into develop (#524)
67e3330 
* Sync submodule (#498)

Co-authored-by: ad-daniel <[email protected]>

* Update link to wiki page in README.md (#499)

* Update README.md

* Update README.md

Co-authored-by: Olivier Michel <[email protected]>

* Keep webots and libController to R2022b rev1

* Update robot launch files (#502)

* update changelog and packages.xml (#506)

* Fix camera focal length (#510)

* Fix camera focal length

* Update CHANGELOG.rst

* Update CHANGELOG.rst

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#518)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#521)

Co-authored-by: ad-daniel <[email protected]>

* Upgrade urdf2webots to 2.0.3 (#516)

* Upgrade urdf2webots to 2.0.3

* Fix

* Fix

* Update calculation of `CameraRecognitionObject` (#523)

* Update calculation of CameraRecognitionObject

Calculation now conforms to the new camera coordinate frame introduced
with Webots R2022b.

Signed-off-by: Andreas Kreutz <[email protected]>

* Add test for recognition object calculation

Signed-off-by: Andreas Kreutz <[email protected]>

* Add missing dependency

Signed-off-by: Andreas Kreutz <[email protected]>

* Fix linting error

Signed-off-by: Andreas Kreutz <[email protected]>

* Update changelogs

Signed-off-by: Andreas Kreutz <[email protected]>

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>

* Update webots

* update changelog and packages.xml (#526)

* Keep correct version of Webots

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Andreas Kreutz <[email protected]>
@ad-daniel
Remove deprecared webots_ros2_core package (#525)
0e45db3 
* Remove

* Minor

* Fix changelog

* Fix submodule
@ygoumaz
Add Python API compatibility and libController compilation (#508)
4cea114 
* Update from #503

* Update webots submodule

* Update python install cmake

* Update libcontroller commit

* shallow submodule

* Cleanup + rename python modules

* Add symlinks for libController + cleanup

* Convert to C API

* Converting ros2control to C API

* Update python plugin to load correct libController

* Update repo

* pull specific branch from webots

* update test version for buildfarm

* Revert "update test version for buildfarm"

This reverts commit bf80017.

* Add explanation for WEBOTS_HOME

* update to commit

* replace submodule by commited files

* Delete webots

* Rename libcontroller to webots

* Add changelog

* Update changelog version

* Remove useless files
@ygoumaz
Upgrade to R2023a (develop) (#535)
813770a 
* Change minimal version to R2023a

* Update ci_before_init_embed.bash

* Upgrade worlds to R2023a

* Update copyrights
@ygoumaz
Enhancement add auto libcontroller sync (#528)
d78b481 
* cleanup + new script

* launch test

* fix wrong path

* Update titles and url

* Copy files anyway

* improve infos and copy

* remove comments

* final touch

* change step name

* trigger sync

* change checkout branch

* restore changes
@ygoumaz @github-actions
@stefaniapedrazzi @omichel @lukicdarkoo @ad-daniel @AKreutz
Merge master into develop (#542)
5afd530 
* Sync submodule (#498)

Co-authored-by: ad-daniel <[email protected]>

* Update link to wiki page in README.md (#499)

* Update README.md

* Update README.md

Co-authored-by: Olivier Michel <[email protected]>

* Keep webots and libController to R2022b rev1

* Update robot launch files (#502)

* update changelog and packages.xml (#506)

* Fix camera focal length (#510)

* Fix camera focal length

* Update CHANGELOG.rst

* Update CHANGELOG.rst

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#518)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#521)

Co-authored-by: ad-daniel <[email protected]>

* Upgrade urdf2webots to 2.0.3 (#516)

* Upgrade urdf2webots to 2.0.3

* Fix

* Fix

* Update calculation of `CameraRecognitionObject` (#523)

* Update calculation of CameraRecognitionObject

Calculation now conforms to the new camera coordinate frame introduced
with Webots R2022b.

Signed-off-by: Andreas Kreutz <[email protected]>

* Add test for recognition object calculation

Signed-off-by: Andreas Kreutz <[email protected]>

* Add missing dependency

Signed-off-by: Andreas Kreutz <[email protected]>

* Fix linting error

Signed-off-by: Andreas Kreutz <[email protected]>

* Update changelogs

Signed-off-by: Andreas Kreutz <[email protected]>

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>

* update changelog and packages.xml (#526)

* Update ci_before_init_embed.bash (#536)

* Merge develop into master for 2023 version (#540)

* Sync submodule (#501)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#507)

Co-authored-by: ad-daniel <[email protected]>

* Merge master into develop (#524)

* Sync submodule (#498)

Co-authored-by: ad-daniel <[email protected]>

* Update link to wiki page in README.md (#499)

* Update README.md

* Update README.md

Co-authored-by: Olivier Michel <[email protected]>

* Keep webots and libController to R2022b rev1

* Update robot launch files (#502)

* update changelog and packages.xml (#506)

* Fix camera focal length (#510)

* Fix camera focal length

* Update CHANGELOG.rst

* Update CHANGELOG.rst

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#518)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#521)

Co-authored-by: ad-daniel <[email protected]>

* Upgrade urdf2webots to 2.0.3 (#516)

* Upgrade urdf2webots to 2.0.3

* Fix

* Fix

* Update calculation of `CameraRecognitionObject` (#523)

* Update calculation of CameraRecognitionObject

Calculation now conforms to the new camera coordinate frame introduced
with Webots R2022b.

Signed-off-by: Andreas Kreutz <[email protected]>

* Add test for recognition object calculation

Signed-off-by: Andreas Kreutz <[email protected]>

* Add missing dependency

Signed-off-by: Andreas Kreutz <[email protected]>

* Fix linting error

Signed-off-by: Andreas Kreutz <[email protected]>

* Update changelogs

Signed-off-by: Andreas Kreutz <[email protected]>

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>

* Update webots

* update changelog and packages.xml (#526)

* Keep correct version of Webots

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Andreas Kreutz <[email protected]>

* Remove deprecared `webots_ros2_core` package (#525)

* Remove

* Minor

* Fix changelog

* Fix submodule

* Add Python API compatibility and libController compilation (#508)

* Update from #503

* Update webots submodule

* Update python install cmake

* Update libcontroller commit

* shallow submodule

* Cleanup + rename python modules

* Add symlinks for libController + cleanup

* Convert to C API

* Converting ros2control to C API

* Update python plugin to load correct libController

* Update repo

* pull specific branch from webots

* update test version for buildfarm

* Revert "update test version for buildfarm"

This reverts commit bf80017.

* Add explanation for WEBOTS_HOME

* update to commit

* replace submodule by commited files

* Delete webots

* Rename libcontroller to webots

* Add changelog

* Update changelog version

* Remove useless files

* Upgrade to R2023a (develop) (#535)

* Change minimal version to R2023a

* Update ci_before_init_embed.bash

* Upgrade worlds to R2023a

* Update copyrights

* Enhancement add auto libcontroller sync (#528)

* cleanup + new script

* launch test

* fix wrong path

* Update titles and url

* Copy files anyway

* improve infos and copy

* remove comments

* final touch

* change step name

* trigger sync

* change checkout branch

* restore changes

* Remove version update

* change version for tests

* revert version

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Andreas Kreutz <[email protected]>

Signed-off-by: Andreas Kreutz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Andreas Kreutz <[email protected]>
@github-actions
Sync submodule (#544)
06f14c5 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#547)
625f5bd 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#550)
e2bfba9 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#553)
47d50c5 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#556)
0f5d3d3 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#563)
7151b4d 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#566)
ecffb37 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#571)
3c1dd9a 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#589)
06cffad 
Co-authored-by: ad-daniel <[email protected]>
@ad-daniel
Merge branch 'master' into merge-master-into-develop
1817825
@ad-daniel
Merge pull request #598 from cyberbotics/merge-master-into-develop
001285d 
Merge `master` into `develop`
@ad-daniel
Enforce clang format (#599) (#601)
3da50ad 
* 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
@github-actions
Sync submodule (#605)
7eec9b4 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#608)
1783557 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#611)
a111867 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#614)
6d16b9f 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#618)
8539f74 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#621)
cc23766 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#624)
79c4dee 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#628)
732f534 
Co-authored-by: ad-daniel <[email protected]>
@ygoumaz @ad-daniel
@github-actions @sebastianohl @omichel
Sync master with develop (#630)
d999fa6 
* Enforce clang format (#599)

* 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

* Sync submodule (#602)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#606)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#609)

Co-authored-by: ad-daniel <[email protected]>

* Sync submodule (#613)

Co-authored-by: ad-daniel <[email protected]>

* Fix macOS local assets with relative URLs (#612)

* Add macOS copy

* remove host

* Update changelogs

* Optional Ros2 Supervisor (#616)

* webots launcher creates supervisor if needed

* Update launch files

* minor fix

* Update changelogs

* Fix URDF spawner on macOS and WSL (#610)

* 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]>

* update changelogs and version (#620)

* Sync submodule (#623)

Co-authored-by: ad-daniel <[email protected]>

* adding possibility to select stream type (#625)

* 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]>

* Fix tests (#633)

* fix pep8

* fix pep8

---------

Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Sebastian Ohl <[email protected]>
Co-authored-by: Sebastian Ohl <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
@ygoumaz
Update sync_controller_lib.sh (#629)
e9cc6dc
ygoumaz and others added 24 commits May 17, 2023 15:39
@ygoumaz
Merge pull request #751 from cyberbotics/merge-master-into-develop
92f5402 
Merge master into develop
@github-actions
Sync submodule (#752)
dd566c7 
Co-authored-by: ad-daniel <[email protected]>
@ygoumaz
Feature WebotsController node (#746)
5b769d9 
* create WebotsController node

* start controller with parameters

* add remappings

* minor

* adapt launch files

* Update robot description to file path

* clang format and cleanup

* adapt launch files

* minor

* fix driver test

* minor

* fix webots_home env

* remove rpath in driver

* update changelogs
@ygoumaz
Install libgeneric_robot_window.so in driver (#742)
7516e7a 
* install generic robot window in driver

* Update CHANGELOG.rst

* Update CHANGELOG.rst
@ygoumaz
Merge branch 'develop' into sync-master-835e5ef
7f9c318
@ygoumaz
Merge pull request #754 from cyberbotics/sync-master-835e5ef
dee9fa8 
Merge master into develop
@ygoumaz
Merge branch 'develop' into sync-master-4ba4eb1
68bc42b
@ygoumaz
Merge pull request #758 from cyberbotics/sync-master-4ba4eb1
94ef313 
Merge master into develop
@justinberi
749 ros2camera publishes non canonical topics and camera info (#761)
074675e 
* Default to canonical topic names for Ros2Camera and Ros2RangeFinder, and ensure camera info stamp is updated

Signed-off-by: Justin Beri <[email protected]>

* Update change logs

Signed-off-by: Justin Beri <[email protected]>

* Update tests with new default topic names

Signed-off-by: Justin Beri <[email protected]>

---------

Signed-off-by: Justin Beri <[email protected]>
@ygoumaz
Merge branch 'develop' into sync-master-b901918
653b00a
@ygoumaz
Update robot_launch.py
8b0ee83
@ygoumaz
Update robot_launch.py
16e4a46
@ygoumaz
Merge pull request #762 from cyberbotics/sync-master-b901918
b8fe29e 
Merge master into develop
@ygoumaz
fix sources
93bd27e
@ygoumaz
Merge branch 'develop' into sync-master-720cb0c
68a2d30
@ygoumaz
fix
891b495
@ygoumaz
fix testing tests
6da4618
@ygoumaz
Merge pull request #769 from cyberbotics/sync-master-720cb0c
3762d7a 
Merge master into develop
Sync submodule
69e4859
@omichel
Merge pull request #773 from cyberbotics/sync-develop-eee8e098c2fa74b…
6f8c08f 
…6738249afa89797eee9ebb770

Sync libcontroller develop
Sync submodule
8f8bff6
@omichel
Merge pull request #774 from cyberbotics/sync-develop-a3ffbea6fdafc26…
951c031 
…cf572d0fa36a63f40c3866d7b

Sync libcontroller develop
@stefaniapedrazzi
Adding VacuumGripper device (#771)
e6d4424 
* Add VacuumGripper static plugin

* Update main changelog

* Add GetBool srv

* Fix msg and srv

* Update Changelog

* Fix msgs declarations
@ygoumaz
Update version.txt
bae3c55
@ygoumaz ygoumaz marked this pull request as ready for review June 19, 2023 13:33
@ygoumaz ygoumaz requested a review from omichel June 19, 2023 13:34
omichel
omichel approved these changes Jun 19, 2023
View reviewed changes
Copy link
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

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

Thank you.

@ygoumaz ygoumaz merged commit 006a96f into master Jun 19, 2023
@ygoumaz ygoumaz deleted the merge-develop-into-master branch June 19, 2023 13:36
@ygoumaz ygoumaz mentioned this pull request Jun 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@omichel omichel omichel approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ygoumaz @omichel @ad-daniel @justinberi @stefaniapedrazzi