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

Cherry-picks for 23103 point-release #690

Merged
merged 10 commits into from
Apr 26, 2024

Conversation

jhanca-robotecai
Copy link
Contributor

@jhanca-robotecai jhanca-robotecai commented Apr 24, 2024

This PR collects changes that should be integrated into the next point-release. Please find the list below:
#633 - updates in the documentation that are common for main and development
#636 - fix for rclcpp SIGINT and SIGTERM handling (it was not handled in 2310.2)
#645 - fix in Twist Robot Control that allows to move the robot more smoothly
#663 - fix of the ROS2 Python tests that did not work in 2310.2
#677 - fix in scale calculation applied to a sensor (sensors were not placed correctly when scaled)
#680 - fix of the multiplayer template which did not work in 2310.2
#682 - removal of the unused texture files that were duplicated along different Gems
#665 - Partially cherry-picked to enable compilation of WarehouseAutomationGem with a project-centric approach.

Additionally, please find the list of changes that are NOT included in this PR even though they might look like a good candidate for the point-release at first sight:
#613, #654 - changes in spawner rely on multiple other changes, which makes it too big for the point-release
#642 - this fix changes the code that does not exist on the main branch yet
#676, #681 - the project templates were heavily modified, including changes that require changes in o3de and more changes from o3de-extras (modified ROS2FrameEditorComponent); it would require a complete rework to be applicable in the point-release

I built three project templates to test the changes:

  • ROS2ProjectTemplate
  • ROS2ManipulationTemplate
  • Multiplayer

lgleim and others added 9 commits April 24, 2024 10:13
Fixes SIGINT and SIGTERM handling to adequately shut down o3de processes that host an rclcpp instance, especially to fix process termination via `CTRL+C` keyboard command

Cf. ros2/rclcpp#317 (comment)

Signed-off-by: Lars Gleim <lgleim@users.noreply.github.com>
Co-authored-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
* update ProteusRobot and RosRobotSample gems docs
* update WarehouseSample readme
* add WarehouseAutomation gem readme
* code review
* fix ROS2 -> ROS 2
* code review: add readme images
---------
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Co-authored-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Adjusted Twist component to apply twist in every phycisc step.
 - Improves the accuracy of the twist applied to the robot.
 - Enable simple simulation of flying robots.

---------

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Jan Hanca <jan.hanca@robotec.ai>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Co-authored-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
* Add pip requirements for ROS2 Gem
* Change test level to DefaultLevel

---------

Signed-off-by: Mateusz Wasilewski <mateusz.wasilewski@robotec.ai>
Signed-off-by: Mateusz Wasilewski <mateuszwasilewski12@gmail.com>
Co-authored-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Shauna Gordon <shauna@shaunagordon.com>
Building a project with this template throws "you cannot bind an lvalue to an rvalue reference" error.
Copilot suggests removing the template declaration in the call to fix this.

Signed-off-by: Shauna Gordon <shauna@shaunagordon.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
@jhanca-robotecai jhanca-robotecai changed the title Jh/cherries for 23103 Cherry-picks for 23103 point-release Apr 24, 2024
@jhanca-robotecai jhanca-robotecai marked this pull request as ready for review April 24, 2024 12:32
@jhanca-robotecai jhanca-robotecai requested review from a team as code owners April 24, 2024 12:32
@jhanca-robotecai
Copy link
Contributor Author

Tested with 2cb3fe2632 of o3de point-release/23103 branch.

It casued compilation error on engine-centric build.
It is manually cherrypicked from PR o3de#665.

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
@michalpelka
Copy link
Contributor

michalpelka commented Apr 25, 2024

Tested with the project-centric approach with 3 robotics templates.
O3DE revision : d17eb346 from point-release/23103.
It works in profile.

Copy link
Contributor

@nick-l-o3de nick-l-o3de left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing pops out at me as necessarily incorrect here...

@michalpelka
Copy link
Contributor

Started AR build.

@michalpelka
Copy link
Contributor

michalpelka commented Apr 26, 2024

Build succeeded, but status was not reported back to GH:
https://jenkins.build.o3de.org/view/Projects/job/o3de-extras/view/change-requests/job/PR-690/3/

@arturkamieniecki
Copy link
Contributor

I've tested with the https://github.com/o3de/o3de/tree/point-release/23103. And ros2projectTemplate. Works as intended.

@amzn-changml
Copy link
Contributor

amzn-changml commented Apr 26, 2024

As the AR job succeeded, but not reported back here, I'll go ahead with the bypass and merge this

@amzn-changml amzn-changml merged commit 8353534 into o3de:point-release/23103 Apr 26, 2024
1 check passed
@jhanca-robotecai jhanca-robotecai deleted the jh/cherries_for_23103 branch May 7, 2024 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants