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

Improve Node Field Query API #151

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from

Conversation

CoolSpy3
Copy link

ROS changes from cyberbotics/webots#6613

omichel and others added 9 commits December 9, 2022 14:57
* Merge `master` into `develop` (cyberbotics#129)

* Add controllers directory to CMakeLists (cyberbotics#122)

* Feature worlds using extern proto (cyberbotics#117)

* adding EXTERNPROTOs to the webots_ros worlds

* resolving merge conflicts

* resolving merge conflicts

* resolving merge conflicts

* adding the EXTERNPROTOS in the webots_ros worlds

* adding the EXTERNPROTOS in the webots_ros worlds

* comment

* Update worlds/tiago.wbt

Co-authored-by: Yannick Goumaz <[email protected]>

* Create update_urls.py (cyberbotics#123)

* Fix hard code urls (cyberbotics#124)

* Hard coded URLs

* Delete update_urls.py

* Fixed ROS service (cyberbotics#126)

* Fix import node test (cyberbotics#127)

* Fixed ROS service

* Removed import node from complete_test

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

* Merge master into develop (cyberbotics#132)

* Add controllers directory to CMakeLists (cyberbotics#122)

* Feature worlds using extern proto (cyberbotics#117)

* adding EXTERNPROTOs to the webots_ros worlds

* resolving merge conflicts

* resolving merge conflicts

* resolving merge conflicts

* adding the EXTERNPROTOS in the webots_ros worlds

* adding the EXTERNPROTOS in the webots_ros worlds

* comment

* Update worlds/tiago.wbt

Co-authored-by: Yannick Goumaz <[email protected]>

* Create update_urls.py (cyberbotics#123)

* Fix hard code urls (cyberbotics#124)

* Hard coded URLs

* Delete update_urls.py

* Fixed ROS service (cyberbotics#126)

* Fix import node test (cyberbotics#127)

* Fixed ROS service

* Removed import node from complete_test

* Add missing declarations (cyberbotics#130)

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

* Update node_disable_contact_points_tracking.srv (cyberbotics#138) (cyberbotics#139)

* Merge master into develop (cyberbotics#141)

* Update node_disable_contact_points_tracking.srv (cyberbotics#138)

* Update complete_test.cpp (cyberbotics#140)

* Feature VacuumGripper device (cyberbotics#144)

* Test VacuumCup API

* Rename device

* Fix test

* Fix srv type

* Update src/complete_test.cpp

---------

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

* Update TIAGo PROTO name (cyberbotics#143)

---------

Co-authored-by: Yannick Goumaz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: carikaser <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
* Merge `master` into `develop` (cyberbotics#129)

* Add controllers directory to CMakeLists (cyberbotics#122)

* Feature worlds using extern proto (cyberbotics#117)

* adding EXTERNPROTOs to the webots_ros worlds

* resolving merge conflicts

* resolving merge conflicts

* resolving merge conflicts

* adding the EXTERNPROTOS in the webots_ros worlds

* adding the EXTERNPROTOS in the webots_ros worlds

* comment

* Update worlds/tiago.wbt

Co-authored-by: Yannick Goumaz <[email protected]>

* Create update_urls.py (cyberbotics#123)

* Fix hard code urls (cyberbotics#124)

* Hard coded URLs

* Delete update_urls.py

* Fixed ROS service (cyberbotics#126)

* Fix import node test (cyberbotics#127)

* Fixed ROS service

* Removed import node from complete_test

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

* Merge master into develop (cyberbotics#132)

* Add controllers directory to CMakeLists (cyberbotics#122)

* Feature worlds using extern proto (cyberbotics#117)

* adding EXTERNPROTOs to the webots_ros worlds

* resolving merge conflicts

* resolving merge conflicts

* resolving merge conflicts

* adding the EXTERNPROTOS in the webots_ros worlds

* adding the EXTERNPROTOS in the webots_ros worlds

* comment

* Update worlds/tiago.wbt

Co-authored-by: Yannick Goumaz <[email protected]>

* Create update_urls.py (cyberbotics#123)

* Fix hard code urls (cyberbotics#124)

* Hard coded URLs

* Delete update_urls.py

* Fixed ROS service (cyberbotics#126)

* Fix import node test (cyberbotics#127)

* Fixed ROS service

* Removed import node from complete_test

* Add missing declarations (cyberbotics#130)

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

* Update node_disable_contact_points_tracking.srv (cyberbotics#138) (cyberbotics#139)

* Merge master into develop (cyberbotics#141)

* Update node_disable_contact_points_tracking.srv (cyberbotics#138)

* Update complete_test.cpp (cyberbotics#140)

* Update world file version

* Update project files

* Update robot window

* Fix world

---------

Co-authored-by: Yannick Goumaz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: carikaser <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
@CoolSpy3 CoolSpy3 added the enhancement New feature or request label Aug 20, 2024
@CoolSpy3 CoolSpy3 marked this pull request as ready for review August 29, 2024 00:20
@brettle
Copy link

brettle commented Sep 6, 2024

@CoolSpy3, since cyberbotics/webots#6613 targets the develop branch, should this PR also target the develop branch?

@CoolSpy3
Copy link
Author

CoolSpy3 commented Sep 6, 2024

Yes, it probably should. I'll update it.

Edit: It looks like master is currently ahead of develop. We should probably sync the two before merging this.

Edit 2: See #152

@CoolSpy3 CoolSpy3 changed the base branch from master to develop September 6, 2024 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Development

Successfully merging this pull request may close these issues.

6 participants