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 master into develop #598

Merged
merged 42 commits into from
Jan 12, 2023
Merged

Merge master into develop #598

merged 42 commits into from
Jan 12, 2023

Conversation

ad-daniel
Copy link
Contributor

Description

Conflicts:

  • scripts/ci_before_init_embed.bash
  • scripts/sync_controller_lib.sh
  • webots_ros2/CHANGELOG.rst
  • webots_ros2/package.xml
  • webots_ros2/setup.py
  • webots_ros2_control/CHANGELOG.rst
  • webots_ros2_control/package.xml
  • webots_ros2_control/src/Ros2ControlSystem.cpp
  • webots_ros2_core/webots_ros2_core/devices/init.py
  • webots_ros2_core/webots_ros2_core/webots/init.py
  • webots_ros2_driver/CHANGELOG.rst
  • webots_ros2_driver/CMakeLists.txt
  • webots_ros2_driver/include/webots_ros2_driver/plugins/static/Ros2Camera.hpp
  • webots_ros2_driver/package.xml
  • webots_ros2_driver/src/plugins/static/Ros2Camera.cpp
  • webots_ros2_driver/webots/lib/controller/python/controller/radar_target.py
  • webots_ros2_driver/webots/lib/controller/python/vehicle/init.py
  • webots_ros2_driver/webots/src/controller/c/supervisor.c
  • webots_ros2_epuck/CHANGELOG.rst
  • webots_ros2_epuck/package.xml
  • webots_ros2_epuck/setup.py
  • webots_ros2_importer/package.xml
  • webots_ros2_importer/setup.py
  • webots_ros2_mavic/package.xml
  • webots_ros2_mavic/setup.py
  • webots_ros2_msgs/package.xml
  • webots_ros2_tesla/package.xml
  • webots_ros2_tesla/setup.py
  • webots_ros2_tests/package.xml
  • webots_ros2_tests/setup.py
  • webots_ros2_tiago/package.xml
  • webots_ros2_tiago/setup.py
  • webots_ros2_turtlebot/package.xml
  • webots_ros2_turtlebot/setup.py
  • webots_ros2_universal_robot/package.xml
  • webots_ros2_universal_robot/setup.py

github-actions bot and others added 30 commits October 28, 2022 08:45
@github-actions
Sync submodule (#498)
643145d 
Co-authored-by: ad-daniel <[email protected]>
@stefaniapedrazzi @omichel
Update link to wiki page in README.md (#499)
0b595e4 
* Update README.md

* Update README.md

Co-authored-by: Olivier Michel <[email protected]>
@ygoumaz
Keep webots and libController to R2022b rev1
351a0e9
@ygoumaz
Merge branch 'master' into synchronization-merge-develop-in-master
6e7b5bd
@ygoumaz
Merge pull request #500 from cyberbotics/synchronization-merge-develo…
6ebfccd 
…p-in-master

Merge develop into master
@ygoumaz
Update robot launch files (#502)
c0040a9
@ygoumaz
update changelog and packages.xml (#506)
3ffa1de
@lukicdarkoo @ad-daniel
Fix camera focal length (#510)
75118d7 
* Fix camera focal length

* Update CHANGELOG.rst

* Update CHANGELOG.rst

Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#518)
6a7b300 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#521)
cf1677b 
Co-authored-by: ad-daniel <[email protected]>
@ad-daniel
Upgrade urdf2webots to 2.0.3 (#516)
0b62dc3 
* Upgrade urdf2webots to 2.0.3

* Fix

* Fix
@AKreutz @ad-daniel
Update calculation of CameraRecognitionObject (#523)
3f04ae2 
* 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]>
@ygoumaz
update changelog and packages.xml (#526)
1cc1c68
@ygoumaz
Update ci_before_init_embed.bash (#536)
aba315b
@ygoumaz @github-actions
@stefaniapedrazzi @omichel @lukicdarkoo @ad-daniel @AKreutz
Merge develop into master for 2023 version (#540)
0d44327 
* 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]>
@github-actions
Sync submodule (#543)
8558baa 
Co-authored-by: ad-daniel <[email protected]>
@lukicdarkoo @ygoumaz
Allow custom motor-encoder pair (#527)
c02db7e 
* Allow custom motor-encoder pair

* changelog

* Update CHANGELOG.rst

* Update Ros2ControlSystem.cpp

Co-authored-by: Yannick Goumaz <[email protected]>
@ygoumaz @ad-daniel
Prepare for version 2023.0.0 (#545)
564ba94 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#546)
324046f 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#549)
1d65ba6 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#551)
577173b 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#557)
2e377c3 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#564)
10cdda4 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#565)
4b8a81e 
Co-authored-by: ad-daniel <[email protected]>
@github-actions
Sync submodule (#568)
639e10b 
Co-authored-by: ad-daniel <[email protected]>
@ygoumaz
cmake symlinks (#569)
2216e3f
@ygoumaz
Resolving Deprecation Warning with Header File Replacement (#570)
6a94cc8 
* update header

* Update Ros2Camera.hpp

* add rolling
@ygoumaz
Remove symlinks and add shared libs to rpath (#572)
241be2f
@ygoumaz
WSL error: local PROTOs cannot be loaded (#573)
d384fe0 
* Update path to wsl format

* Update changelogs
@ygoumaz
Create .gitignore (#575)
929eac8
ygoumaz and others added 12 commits December 26, 2022 09:19
@ygoumaz
Fix rats life example launcher (#574)
49a2206 
* Update epuck name

* added to changelog
@ygoumaz
Copy gitignore from webots repo (#577)
e1ad582
@github-actions
Sync submodule (#588)
1cb5513 
Co-authored-by: ad-daniel <[email protected]>
@ad-daniel
Fix naming of ros2_control hardware type (#584)
e85b00d 
* Fix naming

* Fix

* Check versions

* Test

* Test

* Cleanup

* Fix
@ad-daniel
Improve comparison (#590)
db38ed5 
* Improve

* Minor

* Fix
@ygoumaz @omichel
Revert E-puck name to e-puck (#587)
a5f21ca 
* replace epuck with e-puck

* Update webots_ros2_epuck/worlds/epuck_world.wbt

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

* Update webots_ros2_epuck/worlds/rats_life_benchmark.wbt

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

Co-authored-by: Olivier Michel <[email protected]>
@ad-daniel
Prepare 2023.0.1 (#591)
4a4a56b 
* Prepare 2023.0.1

* Update changelogs
@ygoumaz
Replace macOS Docker installation by UTM Virtual Machine (#578)
7b6bdc0 
* Replace docker address by routing ip

* Fix tcp arguments + cleanup

* minor
@TBreeze98 @omichel @ygoumaz
Added ability to import objects with webots wbt type. Refactored the … (
7c978b8 
#539)

* Added ability to import objects with webots mdt type. Refactored the superviser file to allow for this feature addition. Signed-off-by: TBreeze98

* fixed typo

* corrected file location

* changed all references of wdt and mdt to wbt

* made changes suggested by ygoumaz

* added field type check which fixes crash

* changed variable names as suggested by ygoumaz

* removed modifications of field.py

* added check to validate that the object has been imported into the world

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

* Update webots_ros2_driver/webots_ros2_driver/ros2_supervisor.py

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

Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Yannick Goumaz <[email protected]>
@ad-daniel
Remove documentation workflow (#596)
0bbc8ac
@ad-daniel
Drop support for galactic (#594)
8787e22 
* Drop support for galactic

* Add changelog entry
@ad-daniel
Merge branch 'master' into merge-master-into-develop
1817825
@ad-daniel ad-daniel added the synchronization Used when synchronizing branches label Jan 11, 2023
@ad-daniel ad-daniel self-assigned this Jan 11, 2023
@ad-daniel
Copy link
Contributor Author

The tests have passed in the "Checks tab", not sure why the main page doesn't refresh to show the results

@ad-daniel ad-daniel marked this pull request as ready for review January 12, 2023 07:44
omichel
omichel approved these changes Jan 12, 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.

@omichel omichel added synchronization Used when synchronizing branches and removed synchronization Used when synchronizing branches labels Jan 12, 2023
@ad-daniel ad-daniel merged commit 001285d into develop Jan 12, 2023
@ad-daniel ad-daniel deleted the merge-master-into-develop branch January 12, 2023 08:07
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

@ad-daniel ad-daniel

Labels
synchronization Used when synchronizing branches
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ad-daniel @omichel @stefaniapedrazzi @ygoumaz @lukicdarkoo @AKreutz @TBreeze98