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

Update Webots tutorials to 2023.1.0 #3763

Conversation

ygoumaz
Copy link
Contributor

@ygoumaz ygoumaz commented Jun 30, 2023

With the new release of webots_ros2 (2023.1.0), we introduced a new ROS 2 node, which allows to easily declare a robot controller in the launch files.

This change can be ported to Iron. The new version will not be available for Humble until the next sync, so I wonder if it is possible to backport the changes only when the next sync takes place.

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions
@ygoumaz ygoumaz marked this pull request as ready for review June 30, 2023 09:30
@clalancette
Copy link
Contributor

This change can be ported to Iron. The new version will not be available for Humble until the next sync, so I wonder if it is possible to backport the changes only when the next sync takes place.

Yes, that's fine. I'll just mark this as a backport to Iron for now, make sure to ping again when you want the Humble update done.

@clalancette clalancette added the backport-iron backport at reviewers discretion; from rolling to iron label Jun 30, 2023
@clalancette clalancette merged commit b7d9cb2 into ros2:rolling Jun 30, 2023
3 checks passed
mergify bot pushed a commit that referenced this pull request Jun 30, 2023
* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

(cherry picked from commit b7d9cb2)
clalancette pushed a commit that referenced this pull request Jun 30, 2023
…3766)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

(cherry picked from commit b7d9cb2)

Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
ygoumaz added a commit to cyberbotics/ros2_documentation that referenced this pull request Jul 11, 2023
* Update launch files to declare WebotsController node (#11) (ros2#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (ros2#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (ros2#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (ros2#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (ros2#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
@ygoumaz
Copy link
Contributor Author

ygoumaz commented Jul 25, 2023

As Humble just got a sync, this tutorial can now be backported to Humble too.

@clalancette
Copy link
Contributor

@Mergifyio backport humble

@mergify
Copy link
Contributor

mergify bot commented Jul 25, 2023

backport humble

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 25, 2023
* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

(cherry picked from commit b7d9cb2)
clalancette pushed a commit that referenced this pull request Jul 25, 2023
…3795)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

(cherry picked from commit b7d9cb2)

Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
audrow pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
mergify bot pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)
mergify bot pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

# Conflicts:
#	source/Tutorials/Advanced/Simulators/Webots/Simulation-Webots.rst
audrow pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
audrow added a commit that referenced this pull request Jul 26, 2023
* Enhancement Add Ros2Supervisor tutorial (#3790)

* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

# Conflicts:
#	source/Tutorials/Advanced/Simulators/Webots/Simulation-Webots.rst

* Fix merge conflict

Signed-off-by: GitHub <noreply@github.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
Co-authored-by: Audrow Nash <audrow@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-iron backport at reviewers discretion; from rolling to iron
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants