ROS2 Gem: New components for simulating manipulators#161
ROS2 Gem: New components for simulating manipulators#161lgleim merged 2 commits intoo3de:developmentfrom
Conversation
87476ac to
323ff1f
Compare
|
@danielemorra98 as a quick note before I review, I noticed you made some changes to ROS2Frame that might be overlapping with another PR that is going to be merged soon: #119. Please also consider rebasing on recent changes in conflicting files. |
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Include/ROS2/Manipulator/JointPublisherComponent.h
Outdated
Show resolved
Hide resolved
michalpelka
left a comment
There was a problem hiding this comment.
Great work! Needs some refinements, but looks awesome.
How to test this contribution?
Gems/ROS2/Code/Source/VehicleDynamics/DriveModels/AckermannDriveModel.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Source/Manipulator/ManipulatorControllerComponent.cpp
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Source/Manipulator/ManipulatorControllerComponent.cpp
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Source/Manipulator/ManipulatorControllerComponent.cpp
Outdated
Show resolved
Hide resolved
| { | ||
| m_status.emplace(name, AZStd::string::format("Failed: %s", result.GetError().c_str())); | ||
| } | ||
| hierarchyMap[AZ::Name(name.c_str())] = childEntity.GetValue(); |
There was a problem hiding this comment.
Consider AZ::Name(name.c_str(), name.size())
There was a problem hiding this comment.
I did not find this constructor type. Are you sure about this?
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
adamdbrw
left a comment
There was a problem hiding this comment.
@danielemorra98 would you like to discuss the design, following the PR with design docs for manipulation? I see that you made some choices which differ from what we came up during our design discussions in the PR, I would like to understand the reasoning behind it better.
Gems/ROS2/Code/Include/ROS2/Manipulator/JointPublisherComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Source/Manipulator/ManipulatorControllerComponent.cpp
Outdated
Show resolved
Hide resolved
| return position; | ||
| } | ||
|
|
||
| float ManipulatorControllerComponent::ComputeFFJointVelocity(float & currentPosition, float & desiredPosition, const rclcpp::Duration & duration) |
There was a problem hiding this comment.
Extract into specific control method classes
| return desiredVelocity; | ||
| } | ||
|
|
||
| float ManipulatorControllerComponent::ComputePIDJointVelocity(float & currentPosition, float & desiredPosition, const uint64_t & deltaTimeNs, int & jointIndex) |
There was a problem hiding this comment.
Extract into specific control method classes
|
Perhaps the best approach would be to have a RFC for the feature since it is new and quite large? |
@michalpelka you can test it importing this URDF and using this launch file. You would need to install MoveIt2 before |
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Include/ROS2/Manipulator/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
8545bd1 to
9a6886a
Compare
1661964 to
9004ac4
Compare
There was a problem hiding this comment.
@danielemorra98 thank you for addressing the high-level design changes, this looks much better now! I focused more on some details now, I believe some are quite important, please take a look at my comments.
Gems/ROS2/Code/Include/ROS2/Manipulation/ManipulatorControllerComponent.h
Outdated
Show resolved
Hide resolved
Gems/ROS2/Code/Source/Manipulation/ManipulatorControllerComponent.cpp
Outdated
Show resolved
Hide resolved
|
@adamdbrw I addressed the modifications from your latest comments, tell me what you think. Especially regarding the new map stored in the |
There was a problem hiding this comment.
@danielemorra98 thank you for applying the comments, great improvements here!
Let me know if there are unresolved comments (I resolved some but if you comment / react to each it could help).
After making sure the comments are resolved we will try the PR and we can go ahead and approve it!
Gems/ROS2/Code/Include/ROS2/Manipulation/JointPublisherComponent.h
Outdated
Show resolved
Hide resolved
|
@adamdbrw Now it looks like every comment is marked as resolved |
|
@michalpelka @adamdbrw I am facing compilation errors when I build the Project with the latest commit of both |
|
@danielemorra98 to merge it need to be compiled against the development of both o3de-extras and o3de. |
5d6072a to
a3c7be6
Compare
|
@michalpelka I meant something outside from this PR: |
|
@danielemorra98 , I was able to compile your PR with small adjusments:
|
|
@danielemorra98, @michalpelka Lets fix the conflicts and the header issue (which is outside of this PR), rerun the AR, confirm with a test and have this PR merged (if everyone agrees). |
Looks like this has been addressed with #218
@danielemorra98 Can you please have a look at implementing the two remaining proposed changes? |
|
|
CI build passed. @michalpelka Are you still facing compilation issues regarding exception handling? |
|
@lgleim the CI build unfortunately does not check much as the Gem only builds with a Project that has it enabled, this is currently not checked. We can help and check this on our side with an empty project. We can check the UX as well since we are coming closer to a release (however, this PR targets development, is it intended for stabilization/release as well?) I see there is a couple of commits which do not belong to the new changeset: 14bcd07 and 848efbd. Could we remove them from this PR? @michalpelka could assist with that. |
Is anyone currently working on end-to-end testing, e.g. via python scripts?
That would be much appreciated. We were targeting development based on the discussion we previously had around further refactoring the controller architecture (cf. o3de/sig-simulation#54) but would be happy to see this feature making stabilization/release
Absolutely, any help to move this forward is much appreciated. |
@adamdbrw some more recent commits undo the modification of the above mentioned ones. I probably added confusion, since I did not know how to remove those commits to the PR. |
|
@danielemorra98 I think it would be the best and the easiest to run an interactive rebase (git rebase -i) reaching to the very first commit in this branch. Since you are the only author of this PR and the commits would be squashed on merge anyway, you could rebase it into a single commit (squashing all but one) and then rebase that commit on the newest development branch to produce a nice and clean change-set. This would get rid of the confusing extra commits. What do you think? |
Signed-off-by: danielemorra98 <morradaniele@ymail.com> * Review changes Signed-off-by: alek-kam-robotec-ai <aleksander.kaminski@robotec.ai> * Add Entity Exclusion Signed-off-by: alek-kam-robotec-ai <aleksander.kaminski@robotec.ai> * Review changes Signed-off-by: Aleksander Kamiński <aleksander.kaminski@robotec.ai> * Review changes v2 Signed-off-by: Aleksander Kamiński <aleksander.kaminski@robotec.ai> * Adjusted to review Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Fixed initialization of component Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Adjust to suggestions Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> --------- Signed-off-by: alek-kam-robotec-ai <aleksander.kaminski@robotec.ai> Signed-off-by: Aleksander Kamiński <aleksander.kaminski@robotec.ai> Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Co-authored-by: Michał Pełka <michal.pelka@robotec.ai> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> building the hierarchy map that store joint_name and joint_entities Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> save the hierarchy joint map in a component Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> building the a component that access to joint position and publish them on ROS2 /joint_states topic Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> added the PhysX Gem (Game) and ROS2 control_msgs Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new implementation of jointPublisherComponent (WORKING) Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new function to retrieve the hierarchyMap Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> added the descriptor to the Gem Module Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cmake files modifications Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new manipulator component Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> ON PROGRESS: modification at ManipulatorComponent Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> (NOT WORKING PROPERLY) two new ComputJointVelocity logics Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> fixed bug about the initialization of the PIDs vector + little changes Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> some cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> adding providing and required services Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> AZ_TracePrintf and minor things Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> additional comments Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> include format consistency modifications Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> come back to previous ROS2Frame version Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> sorting modification Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup and minor things Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> added ComboBox Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new reference to ROS2 JointState msg Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new inheritance for JointPublisherComponent Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> minor changes Signed-off-by: Daniele Morra <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> New RosFrame logic to choose between dynamic and static tf It is based on Joint type Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> forgot to include PhisX component header file Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> save the hierarchy joint map in a component Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> building the a component that access to joint position and publish them on ROS2 /joint_states topic Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new implementation of jointPublisherComponent (WORKING) Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> new manipulator component Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> ON PROGRESS: modification at ManipulatorComponent Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> (NOT WORKING PROPERLY) two new ComputJointVelocity logics Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> fixed bug about the initialization of the PIDs vector + little changes Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> some cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> adding providing and required services Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> additional comments Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> include format consistency modifications Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> come back to previous ROS2Frame version Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> sorting modification Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup and minor things Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> added ComboBox Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> minor changes Signed-off-by: Daniele Morra <d50030749@china.huawei.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> comments following the defined format Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Add missing includes Signed-off-by: Aleksander Kamiński <aleksander.kaminski@robotec.ai> Signed-off-by: Daniele Morra <morradaniele@ymail.com> some cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> adding frequency user specification Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> first implementation of jointName inside ROS2Frame Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> remotion of MetadataComponent + using jointName in ROS2FrameComponent Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Refactor and some additional comments Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Update ManipulatorControllerComponent.cpp Signed-off-by: danielemorra98 <48955695+danielemorra98@users.noreply.github.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> updated ROS2Gem README.md with new dependencies Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> added and exposed ROS2 controller name in ManipulatorControllerComponent Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> minor changes Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Update Gems/ROS2/Code/Include/ROS2/Frame/ROS2FrameComponent.h Co-authored-by: Lars Gleim <lgleim@users.noreply.github.com> Signed-off-by: danielemorra98 <48955695+danielemorra98@users.noreply.github.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Added documentation on expected input to the SetJointName method Update Gems/ROS2/Code/Include/ROS2/Frame/ROS2FrameComponent.h Signed-off-by: Lars Gleim <lgleim@users.noreply.github.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> modifications to follow up new PIDConfiguration refactor Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> minor changes Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cmake enables exceptions Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> Address latest queries Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> small change Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> small change Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> forward class declaration for handling rclcpp_action exceptions Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup, refactor and addressed modifications by GitHub reviews Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup of extra comments Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> small changes Signed-off-by: danielemorra98 <morradaniele@ymail.com> Signed-off-by: Daniele Morra <morradaniele@ymail.com> cleanup Signed-off-by: danielemorra98 <morradaniele@ymail.com> Adding SRG color space as a swapchain option; this allowed rendering to Valve Index Signed-off-by: Gene Walters <genewalt@amazon.com> Made ROS2Frame required for ROS2Odometry to prevent possible crash on run (o3de#211) Signed-off-by: Mateusz Wasilewski <mateusz.wasilewski@robotec.ai> Change how ROS 2 packages are included. (o3de#204) * Change how ROS 2 packages are included. Include cmake configs from the ROS 2 package instead of building lib and include paths. Added function `target_depends_on_ros2_package` that allows specifying version and optionality of the ROS 2 package. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Adjust to review Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Change cmake to treat urdfdom as normal package, not ament package. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> --------- Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Sensor frequency smoothness improvements (o3de#194) * Improve sensor ticking in ROS2 Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Adjust to review. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> --------- Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Adjust camera position on ROSBot in RosRobotSample (o3de#197) Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Remove unused 3rd parameter for AZ_CLASS_ALLOCATOR. (o3de#191) Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com> Rework RGBD sensor. (o3de#117) * Rework RGBD sensor. The RGBD sensor is running only one pipeline with this change. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Adjusted to review Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Apply suggestions from code review, adjusted code to recent API changes. Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: Michał Pełka <michalpelka@gmail.com> --------- Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Signed-off-by: Michał Pełka <michalpelka@gmail.com> Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Add support for custom VK allocator for Vulkan api and a readme file for build steps (o3de#219) * Add support for custom VkAllocationCallbacks for vulkan related api Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> * Add a readme file for the OpenXrTest project that entails steps on how to build the project and how to modify XR pipelines Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> * Minor edit Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> --------- Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> Backport multiple commits from stabilization/2305 to development (o3de#237) * Fleet of Robots template (o3de#186) * Introduce fleet robot template. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * New template name and some fixes - Changed template name - Updated `template.json` file - Added render passes folder - Some visual fixes in the main level Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Extended readme Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Added license file Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Update README.md Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Adjusted to review Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Reverted {BEGIN/END_LICENSE} removal Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Fix: missing entry Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> * Adjustments to review, minor changes to readme Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Apply suggestions from code review Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: Michał Pełka <michalpelka@gmail.com> * Further adjusments to review. Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> --------- Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> Signed-off-by: Michał Pełka <michalpelka@gmail.com> Co-authored-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Added missing headers to `URDFPrefabMaker.h` (o3de#218) Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * As part of fixing o3de#118 (o3de#227) it was discovered that the error log from xacro is cut off on the first angle bracket, making it impossible to see the actual error problem fully if it occurs. This change surrounds the error text with a code macro (three backticks) so that it shows up in markdown as the actual literal code, which causes Qt to ignore any angle brackets and other markdown inside the text. o3de#118 (Will attach a screenshot) Signed-off-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com> * Fix bug with wheel base handling in Vehicle Dynamics in ROS 2. (o3de#229) Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> * Removed incorrect camera sensor (o3de#215) Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> --------- Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Signed-off-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> Signed-off-by: Michał Pełka <michalpelka@gmail.com> Signed-off-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com> Co-authored-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai> Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Co-authored-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com> Add RHIService a dependent of XRSystem (o3de#242) * Make XRSystem depend on RHIService so that RHI is activated before XRSystem is activated Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> * Minor tab Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> * Minor tab issue Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> --------- Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> Manipulation feature design (o3de#163) * Design docs for manipulation --------- Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> Signed-off-by: Michał Pełka <michal.pelka@robotec.ai> Signed-off-by: Mabel Zhang <mabel@openrobotics.org> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: Mabel Zhang <mabel@openrobotics.org>
394f76b to
e79276b
Compare
…o manipulator_controller_component_pr Signed-off-by: Daniele Morra <morradaniele@ymail.com>
|
@adamdbrw now it should be ok |
michalpelka
left a comment
There was a problem hiding this comment.
I was able to test PR and works as intended.
It is unstable (crashes for some user's input), but it can be merged into development and stabilized.
byrcolin
left a comment
There was a problem hiding this comment.
I dont see anything wrong here.
|
Awesome, thanks again to everyone contributing to this feature and getting it up to O3DE community standards! |
This PR follows the discussion about manipulation. The purpose is to develop a controller for manipulators and to build a bridge between the simulation and MoveIt.
It adds three new components:
These components are supposed to make the bridge between the simulation and MoveIt.
I am opened to every kind of inputs/suggestions. I think the most critical parts are:
Tested on:
URDF imported: https://github.com/danielemorra98/custom_panda_moveit/blob/master/urdf/panda.urdf
ROS2 MoveIt2 launch file: https://github.com/danielemorra98/custom_panda_moveit/blob/master/launch/panda.launch.py