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 in develop #312

Merged
merged 32 commits into from
Nov 1, 2021
Merged

Merge master in develop #312

merged 32 commits into from
Nov 1, 2021

Conversation

BenjaminHug8
Copy link
Contributor

@BenjaminHug8 BenjaminHug8 commented Oct 27, 2021 •
edited
Loading

Merge conflict files:

  • .github/workflows/test.yml (rolling line 13)
  • delete packages webots_ros2_abb, webots_ros2_demos, webots_ros2_examples and webots_ros2_ur_e_description.

Otherwise conflicts for the version '1.1.2' to '1.2.0' for setup.py and package.xml files (kept '1.2.0').

lukicdarkoo and others added 30 commits July 19, 2021 14:01
@lukicdarkoo
Fix webots_ros2_control changelog (#251)
2665929 
* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst

* Update CHANGELOG.rst
@lukicdarkoo
Update package.xml (#252)
8d72dda
Added new --no-rendering option to webots launcher (#253)
b9af1b6
@Timple
Fix library directory
55a3741
@Timple
Don't use a subdirectory
4e866a4
@lukicdarkoo
Fix warnings (#255)
dfe630b 
* Fix warnings

* Simpler fix
@lukicdarkoo
Fix Windows build (#258)
091357a 
* Fix Windows build

* ID is not a member anymore

* Export C++ libController

* Fix libController

* Update module

* Fix controller spawner

* Update robot_launch.py
@lukicdarkoo
Update README.md (#259)
9bd50fb
@lukicdarkoo
Fix the IMU library exportation (#262)
d59ab1f 
* Update CMakeLists.txt

* Update CMakeLists.txt
@lukicdarkoo
Prepare version number for 1.1.1 (#264)
95275b5 
* Prepare

* Increase version number
Use ros2 node clock for message timestamping (#263)
c1a1f5c 
* Change to ros2 node clock for all devices
@lukicdarkoo @omichel
Add Python plugin support to webots_ros2_driver (#265)
b2e7635 
* Add Python <--> C++ test

* Prepare

* Initial prototype

* Add WebotsNode object

* Add properties

* Import the Python lib

* Improve error handling

* Cleaner

* Add node example

* Integrate the new libController

* Delete the test

* Fix copyright

* Explain

* Copyright fix

* Constructor can be private

* Print Python errors

* Fix Windows usage

* Update webots_ros2_driver/src/PythonPlugin.cpp

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

* Update webots_ros2_driver/src/WebotsNode.cpp

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

* Update webots_ros2_turtlebot/webots_ros2_turtlebot/plugin_example.py

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

* Use const

Co-authored-by: Olivier Michel <[email protected]>
@lukicdarkoo
Fix Rolling warnings and ament_python_install_package (#266)
b746298 
* Fix Rolling warnings and `ament_python_install_package`

* Add to CI
@lukicdarkoo @stefaniapedrazzi
Add runtime tests (#268)
08a061e 
* Add WebotsLauncher

* Add test package

* Add distance sensor tests

* Add range finder test

* Add plugin test

* Fix spelling

* Add IMU test

* Improve publishing

* Add light sensor test

* Fix colcon test

* Add CI

* Use sudo

* Update

* Update with sudo

* Add missing packages

* Add cache

* Test

* Test

* Test

* Test

* Fix

* Test

* Test

* Test

* Test

* Test

* Increase timeout

* Revert camera test

* pylint

* Fix Windows arguments

* Update webots_ros2_driver/webots_ros2_driver/webots_launcher.py

Co-authored-by: Stefania Pedrazzi <[email protected]>

* Update webots_ros2_driver/webots_ros2_driver/utils.py

Co-authored-by: Stefania Pedrazzi <[email protected]>

* Update webots_ros2_driver/webots_ros2_driver/utils.py

Co-authored-by: Stefania Pedrazzi <[email protected]>

* Update webots_ros2_driver/webots_ros2_driver/utils.py

Co-authored-by: Stefania Pedrazzi <[email protected]>

* Update utils.py

* Update driver_test.wbt

Co-authored-by: Stefania Pedrazzi <[email protected]>
@lukicdarkoo
Increase the version number (#277)
e6ae9bd
@lukicdarkoo
Fix URDF importer dependencies (#279)
80466ed 
* Update package.xml

* Update package.xml

* Update package.xml

* Update package.xml

* Update package.xml
@dzywater @lukicdarkoo
Fix uninitialized mWebotsXMLElement (#278)
4422388 
* fix 273

* Update webots_ros2_driver/src/WebotsNode.cpp

Co-authored-by: Darko Lukić <[email protected]>

Co-authored-by: Your Name <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
@dzywater @lukicdarkoo
Fix 280 (#281)
2e0a2b4 
* fix 273

* Update webots_ros2_driver/src/WebotsNode.cpp

Co-authored-by: Darko Lukić <[email protected]>

* let generate webots_ros2_control.lib in windows

Co-authored-by: Your Name <[email protected]>
Co-authored-by: Darko Lukić <[email protected]>
@dzywater
Print tips: robot_state_publisher started or not (#283)
e7766cc 
Print "the `robot_description` parameter is set or not "
@lukicdarkoo
Revert robot_state_publisher check (#285)
60dec55
@lukicdarkoo
Utilize webots_ros2_driver in webots_ros2_mavic and `webots_ros2_…
8704f3e 
…turtlebot` (#269)

* Add turtlebot tests

* Convert Mavic

* Add mavic test

* clean

* Add deps

* Fix node creation

* Increase timeout

* Better

* Fix tests

* Add killall

* Add missing deps

* Wait more in CI

* Fix

* Convert universal robot

* Add rviz

* Fix

* Revert universal robot

* Delete ur changes

* Fix
@BenjaminHug8
Fix to suit to pep257 convention (#290)
1c6daaa 
* init

* fixed all errors pep257

* CI
@BenjaminHug8 @lukicdarkoo
Creation of system test for TurtleBot SLAM tutorial (#292)
31cbda3 
* test system turtlebot tutorial SLAM

* Navigation test and put the 2 tests in a single file

* ci_after_init install foxy turtlebot3

* fix after_init

* CI

* CI after_install_target_depend

* fix

* Update test.yml

* Update ci_after_init.bash

* Update ci_after_install_target_dependencies.bash

* CI permission after_depend

* fix

* fix CI

* check packages

* fix ci ci_after_init_bash

* fix pep257

* CI pep257

* flake8 fix

* flake8

* test only SLAM

* test only slam fix

* test only slam fix flake

* Only Slam test CI

* fix exit for CI

* quit instead exit for CI

* fix CI

* Update scripts/ci_after_init.bash

Co-authored-by: Darko Lukić <[email protected]>

* Update webots_ros2_tests/test/test_system_turtlebot_tutorials.py

Co-authored-by: Darko Lukić <[email protected]>

* improved test slam

* fix merge

* Comment after_init

* Update scripts/ci_after_init.bash

Co-authored-by: Darko Lukić <[email protected]>

Co-authored-by: Darko Lukić <[email protected]>
@BenjaminHug8
fix call we_camera_recognition_disable() on NULL recognition node (#294)
f5f33a9
@lukicdarkoo
Fix Lidar range (#298)
86d6524
@BenjaminHug8 @lukicdarkoo
Utilize webots_ros2_driver in webots_ros2_epuck (#296)
9225e73 
* initial commit progress on epuck alone scenario

* 1st draft full conversion

* system tests in dev

* basic epuck driver converted

* system tests draft

* system tests on simple epuck ok

* Apply suggestions from code review

Co-authored-by: Darko Lukić <[email protected]>

* modif review PR

* CI

* fix CI

* fix CI package test has tf2_ros

* remove testFootPrint

* fix CI driver plugin python test

* System tests for scenarios

* System tests scenarios CI foxy

* Change test plan

* more delay plan test

* more delay plan test fix flake

* fix ci rolling

* fix CI rolling nav2bringup

* fix CI rolling nav2bringup pckg required

* removed test rats scenario

* flake8

* removed file test rats scenario

* review changes

* review changes + flake

* revert changes du to Tesla PR

* fix test tools

* adapt topics name

Co-authored-by: Darko Lukić <[email protected]>
@lukicdarkoo
Utilize webots_ros2_driver in Universal Robot examples (#286)
8bc0f2a 
* Utilize `webots_ros2_driver` in Universal Robot examples

* Fix ros control

* Delete unnecessary packages

* Convert multiarmed demo

* Add description

* Convert multirobot demo

* Delete unnecessary examples

* Unused

* Begin test

* Revert

* fix

* Test

* Avoid warnings

* Test

* Test

* Test

* Update package.xml

* Update package.xml

* Update package.xml

* Add changelog

* Delete

* Missing deps

* Increase delay

* Fix

* Record

* continue

* Update package.xml

* Update package.xml

* Update webots_launcher.py

* Update test.yml

* Update test.yml

* Fix

* Change

* Longer

* Change

* Update test.yml

* Longer

* Update test_system_universal_robot.py
@yanick-douven @Timple
Add --input and --xacro-opts arguments to allow calling xacro2proto f…
4bee7a0 
…rom a launch file
@Timple
Flake8
2616ef6
@lukicdarkoo
Delete unnecessary packages (#301)
3a91326 
* Delete unnecessary packages

* Delete deps

* msgs

* Add new tiago

* wip

* Fix

* fix

* Fix

* Add

* Timeout

* Lighter

* fix

* exit

* revert
BenjaminHug8 and others added 2 commits October 26, 2021 16:56
@BenjaminHug8 @lukicdarkoo @omichel
Tesla conversion from Core to Driver (#300)
fe76bea 
* temp commit

* temp

* temp commit

* pause to dev Autoware Interface

* temp com

* Webots .so files should be ok but tesla do not see vehicle

* system tests ok

* temp com

* change in libcontroller git

* cv2 and numpy package

* remove numpy package.xml

* correction python3-cv2/numpy

* cv2 in package.xml changed in opencv

* save file

* more time test tesla

* more time test tesla 2

* added rosbag debug ci

* flake8

* package rosbag

* qos LaneFollower

* Apply suggestions from code review

Co-authored-by: Darko Lukić <[email protected]>

* Update review

* temp com

* fix windows build

* commentary python pluggin

* Qos lane follower Windows

* lane follower remove debug msg

* Compatiblity Windows and ROS Rolling

* fix flake8

* Update webots_ros2_driver/include/webots_ros2_driver/PluginInterface.hpp

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

* update driver test function static

* update libcontroller

* fix library

* review corrections

* fix

* update libcontroller

* python warning debug removed

Co-authored-by: Darko Lukić <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
@BenjaminHug8
begin merge
24a5738
@BenjaminHug8 BenjaminHug8 requested a review from omichel October 27, 2021 09:53
@BenjaminHug8 BenjaminHug8 self-assigned this Oct 27, 2021
@BenjaminHug8 BenjaminHug8 marked this pull request as ready for review November 1, 2021 15:01
omichel
omichel approved these changes Nov 1, 2021
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.

@BenjaminHug8 BenjaminHug8 merged commit bc8680e into develop Nov 1, 2021
@BenjaminHug8 BenjaminHug8 deleted the merge-master-in-develop branch November 1, 2021 15:36
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

@BenjaminHug8 BenjaminHug8

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@BenjaminHug8 @omichel @lukicdarkoo @cesar-lopez-mar @Timple @dzywater @yanick-douven