Merge pull request #802 from cyberbotics/sync-master-e3299e4

Merge master into develop
cyberbotics · Jun 30, 2023 · 45d8eef · 45d8eef
2 parents f1edfd8 + f7078d2
commit 45d8eef
Show file tree

Hide file tree

Showing 44 changed files with 243 additions and 239 deletions.
diff --git a/webots_ros2/CHANGELOG.rst b/webots_ros2/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Added Ros2Pen static plugin.
 * Added support for Navigation2 in Iron.

diff --git a/webots_ros2/package.xml b/webots_ros2/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>webots_ros2</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>Interface between Webots and ROS2</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2/setup.py b/webots_ros2/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name=package_name,
-    version='2023.0.4',
+    version='2023.1.0',
     packages=[package_name],
     data_files=[
         ('share/' + package_name, ['package.xml']),

diff --git a/webots_ros2_control/CHANGELOG.rst b/webots_ros2_control/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Fixed component activation.
 

diff --git a/webots_ros2_control/package.xml b/webots_ros2_control/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>webots_ros2_control</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>ros2_control plugin for Webots</description>
   <maintainer email="[email protected]">Cyberbotics</maintainer>
   <url type="website">http://wiki.ros.org/webots_ros2</url>

diff --git a/webots_ros2_driver/CHANGELOG.rst b/webots_ros2_driver/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_driver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Added Ros2Pen static plugin.
 * Added parameters to rename Camera and RangeFinder topics.

diff --git a/webots_ros2_driver/package.xml b/webots_ros2_driver/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>webots_ros2_driver</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>Implementation of the Webots - ROS 2 interface</description>
   <maintainer email="[email protected]">Cyberbotics</maintainer>
   <license>Apache License 2.0</license>

diff --git a/webots_ros2_epuck/CHANGELOG.rst b/webots_ros2_epuck/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_epuck
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Added support for Navigation2 in Iron.
 * Clean simulation reset in launch file.

diff --git a/webots_ros2_epuck/package.xml b/webots_ros2_epuck/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>webots_ros2_epuck</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>E-puck2 driver for Webots simulated robot</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2_epuck/setup.py b/webots_ros2_epuck/setup.py
@@ -43,7 +43,7 @@
 
 setup(
     name=package_name,
-    version='2023.0.4',
+    version='2023.1.0',
     packages=[package_name],
     data_files=data_files,
     install_requires=['setuptools', 'launch'],

diff --git a/webots_ros2_epuck/worlds/epuck_world.wbt b/webots_ros2_epuck/worlds/epuck_world.wbt
@@ -1,11 +1,11 @@
 #VRML_SIM R2023b utf8
 
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackground.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/floors/protos/RectangleArena.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/factory/containers/protos/WoodenBox.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/robots/gctronic/e-puck/protos/E-puck.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/robots/gctronic/e-puck/protos/Pi-puck.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackground.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/floors/protos/RectangleArena.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/factory/containers/protos/WoodenBox.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/robots/gctronic/e-puck/protos/E-puck.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/robots/gctronic/e-puck/protos/Pi-puck.proto"
 
 WorldInfo {
   info [

diff --git a/webots_ros2_epuck/worlds/rats_life_benchmark.wbt b/webots_ros2_epuck/worlds/rats_life_benchmark.wbt
@@ -1,13 +1,13 @@
 #VRML_SIM R2023b utf8
 
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackground.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackground.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
 EXTERNPROTO "../protos/LegoTallWall.proto"
 EXTERNPROTO "../protos/LegoTallInterval.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/floors/protos/Floor.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/appearances/protos/Parquetry.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/robots/gctronic/e-puck/protos/E-puck.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/robots/gctronic/e-puck/protos/Pi-puck.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/floors/protos/Floor.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/Parquetry.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/robots/gctronic/e-puck/protos/E-puck.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/robots/gctronic/e-puck/protos/Pi-puck.proto"
 
 WorldInfo {
   info [

diff --git a/webots_ros2_importer/package.xml b/webots_ros2_importer/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>webots_ros2_importer</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>This package allows to convert URDF and XACRO files into Webots PROTO files.</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2_importer/setup.py b/webots_ros2_importer/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name=package_name,
-    version='2023.0.4',
+    version='2023.1.0',
     packages=[package_name, package_name + '.urdf2webots.urdf2webots'],
     data_files=data_files,
     install_requires=[

diff --git a/webots_ros2_importer/webots_ros2_importer/urdf2webots b/webots_ros2_importer/webots_ros2_importer/urdf2webots
diff --git a/webots_ros2_mavic/CHANGELOG.rst b/webots_ros2_mavic/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_mavic
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Clean simulation reset in launch file.
 * Update driver node to new WebotsController node.

diff --git a/webots_ros2_mavic/package.xml b/webots_ros2_mavic/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>webots_ros2_mavic</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>Mavic 2 Pro robot ROS2 interface for Webots.</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2_mavic/setup.py b/webots_ros2_mavic/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name=package_name,
-    version='2023.0.4',
+    version='2023.1.0',
     packages=[package_name],
     data_files=data_files,
     install_requires=['setuptools', 'launch'],

diff --git a/webots_ros2_mavic/worlds/mavic_world.wbt b/webots_ros2_mavic/worlds/mavic_world.wbt
@@ -1,19 +1,19 @@
 #VRML_SIM R2023b utf8
 
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackground.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/floors/protos/Floor.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/appearances/protos/SandyGround.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/road/protos/Road.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/appearances/protos/Pavement.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/buildings/protos/Windmill.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/buildings/protos/SmallManor.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/factory/manhole/protos/SquareManhole.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/factory/containers/protos/CardboardBox.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/vehicles/protos/tesla/TeslaModel3Simple.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/trees/protos/Pine.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/objects/trees/protos/Forest.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/develop/projects/robots/dji/mavic/protos/Mavic2Pro.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackground.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/floors/protos/Floor.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/SandyGround.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/road/protos/Road.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/Pavement.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/buildings/protos/Windmill.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/buildings/protos/SmallManor.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/factory/manhole/protos/SquareManhole.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/factory/containers/protos/CardboardBox.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/vehicles/protos/tesla/TeslaModel3Simple.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/trees/protos/Pine.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/objects/trees/protos/Forest.proto"
+EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/robots/dji/mavic/protos/Mavic2Pro.proto"
 
 WorldInfo {
   info [

diff --git a/webots_ros2_msgs/CHANGELOG.rst b/webots_ros2_msgs/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Added BoolStamped message
 * Added GetBool message

diff --git a/webots_ros2_msgs/package.xml b/webots_ros2_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>webots_ros2_msgs</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>Services and Messages of the webots_ros2 packages.</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2_tesla/CHANGELOG.rst b/webots_ros2_tesla/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog for package webots_ros2_tesla
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2023.1.0 (2023-XX-XX)
+2023.1.0 (2023-06-29)
 ------------------
 * Clean simulation reset in launch file.
 * Update driver node to new WebotsController node.

diff --git a/webots_ros2_tesla/package.xml b/webots_ros2_tesla/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>webots_ros2_tesla</name>
-  <version>2023.0.4</version>
+  <version>2023.1.0</version>
   <description>Tesla ROS2 interface for Webots.</description>
 
   <maintainer email="[email protected]">Cyberbotics</maintainer>

diff --git a/webots_ros2_tesla/setup.py b/webots_ros2_tesla/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name=package_name,
-    version='2023.0.4',
+    version='2023.1.0',
     packages=[package_name],
     data_files=data_files,
     install_requires=['setuptools', 'launch'],
+2 −0		.gitignore
+1 −1		setup.py
+43 −49		tests/expected/Human.proto
+42 −48		tests/expected/HumanR2022a.proto
+793 −0		tests/expected/HumanR2023a.proto
+1 −1		tests/expected/KukaLbrIiwa14R820.proto
+9 −9		tests/expected/MotomanSia20d.proto
+1 −1		tests/expected/RobotWithDummyLink.proto
+47 −0		tests/expected/RobotWithLocalMeshes.proto
+28 −0		tests/sources/RobotWithLocalMeshes.urdf
+1 −1		tests/sources/gait2392_simbody/urdf/human.urdf
+12 −0		tests/test_export.py
+7 −5		urdf2webots/importer.py
+16 −9		urdf2webots/parserURDF.py
+15 −6		urdf2webots/writeRobot.py