-
Notifications
You must be signed in to change notification settings - Fork 90
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
Renamed ign to gz #67
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few preliminary comments. I suggest setting up CI for all target versions so that it's possible to verify that they all work as intended
|
||
#ifdef GZ_HEADERS | ||
#include <gz/sim/System.hh> | ||
#define GZ_SIM_NAMESPACE gz::sim:: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Soon you won't need to define this, because we're backporting the gz::sim
namespace to Citadel and Fortress (gazebo-tooling/release-tools#784)
@destogl the gripper mimic example is not working, do you mind to take a look ? Otherwise I will open an issue |
This change seems OK to me. @livanov93 is fixing this in #86 |
Hi @destogl and @@livanov93, I was debugging the issue and these are my notes:
I will try to follow up with a fix for dart. |
Needs another round of reviews. |
Hi, I am trying this PR with humble and garden and I am not able to load the
Any idea how to solve this? |
Hey Jorge! @jlamperez jumm are you trying any of the example worlds? I think you should update your files, I can see |
@ahcorde you can reproduce it like this:
or
I try sending commands but it is not working.
After a while
|
@jlamperez something is broken in Thank you for reporting |
@jlamperez the release should be out today or tomorrow https://discourse.ros.org/t/preparing-for-humble-sync-and-patch-release-2022-11-21/28234/4 with the patches |
Yes, now when I compile
The other examples are working well for me. Thank you for your help! |
@jlamperez maybe the memory/node is not destroyed properly. I will check it |
Can you add me as a reviewer? |
@azeey I can assign you to the issue, but I can't add you as a reviewer |
.github/workflows/ci.yaml
Outdated
matrix: | ||
version: [fortress] | ||
include: | ||
- docker-image: "ubuntu:22.04" | ||
gz-version: "fortress" | ||
ros-distro: "humble" | ||
- docker-image: "ubuntu:22.04" | ||
gz-version: "fortress" | ||
ros-distro: "rolling" | ||
- docker-image: "ubuntu:22.04" | ||
gz-version: "garden" | ||
ros-distro: "rolling" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be simplified as:
matrix: | |
version: [fortress] | |
include: | |
- docker-image: "ubuntu:22.04" | |
gz-version: "fortress" | |
ros-distro: "humble" | |
- docker-image: "ubuntu:22.04" | |
gz-version: "fortress" | |
ros-distro: "rolling" | |
- docker-image: "ubuntu:22.04" | |
gz-version: "garden" | |
ros-distro: "rolling" | |
matrix: | |
- docker-image: ["ubuntu:22.04"] | |
- gz-version: ["fortress", "garden"] | |
- ros-distro: ["humble", "rolling"] |
.github/workflows/ci.yaml
Outdated
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' | ||
wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add - | ||
if [ "$GZ_VERSION" == "garden" ]; then | ||
GZ_DEPS="libgz-sim7-dev libgz-plugin2-dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GZ_DEPS
is set here, but I don't see where it's being used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is resolved now, but I don't have permissiont o resolve threads in this repo.
@@ -0,0 +1,35 @@ | |||
<?xml version="1.0"?> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Git is treating this as a new file. Can you use git mv
on the ign
version of this file so it's treated as a rename?
@@ -336,7 +355,6 @@ bool IgnitionSystem::initSim( | |||
this->dataPtr->joints_[j].joint_velocity_cmd = initial_velocity; | |||
} | |||
} else if (joint_info.command_interfaces[i].name == "effort") { | |||
this->dataPtr->joints_[j].joint_control_method |= EFFORT; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this removed intentionally?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, it's intentionally
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this removed? I believe it makes sense, but would like to understand.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because this is not part of the registration
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Made some more suggestions to keep it backward compatible, i.e, you can still use names with ign
in them in SDF/URDF/xacro files.
.github/workflows/ci.yaml
Outdated
@@ -28,6 +39,12 @@ jobs: | |||
cp -r gz_ros2_control /home/ros2_ws/src/ | |||
sh -c 'echo "deb http://packages.ros.org/ros2-testing/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-testing.list' | |||
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add - | |||
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should only enable packages.osrfoundation.org if we're testing Garden. For Fortress, we should use what's available in packages.ros.org.
@azeey I included some of your suggestions, let me know what do you think. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes look good! There are still some unresolved comments, so I'll wait
for those before I approve.
.github/workflows/ci.yaml
Outdated
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' | ||
wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add - | ||
if [ "$GZ_VERSION" == "garden" ]; then | ||
GZ_DEPS="libgz-sim7-dev libgz-plugin2-dev" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is resolved now, but I don't have permissiont o resolve threads in this repo.
|
||
#include <hardware_interface/system_interface.hpp> | ||
#include <hardware_interface/types/hardware_interface_type_values.hpp> | ||
|
||
#include <rclcpp/rclcpp.hpp> | ||
|
||
namespace ign_ros2_control | ||
namespace gz_ros2_control |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, I guess the question is do we plan to backport this to older branches? If so, existing code would fail to compile.
@ahcorde I needed this PR to get compile this package against the last released rolling. Probably we can continue with merging. What do you think? What is needed to finish this? |
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
97d021b
to
a614678
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few minor comments.
|
||
#include <hardware_interface/system_interface.hpp> | ||
#include <hardware_interface/types/hardware_interface_type_values.hpp> | ||
|
||
#include <rclcpp/rclcpp.hpp> | ||
|
||
namespace ign_ros2_control | ||
namespace gz_ros2_control |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since there is a Humble release already, we probably can not backport anymore without breaking API. Rolling can break anyway.
@@ -336,7 +355,6 @@ bool IgnitionSystem::initSim( | |||
this->dataPtr->joints_[j].joint_velocity_cmd = initial_velocity; | |||
} | |||
} else if (joint_info.command_interfaces[i].name == "effort") { | |||
this->dataPtr->joints_[j].joint_control_method |= EFFORT; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this removed? I believe it makes sense, but would like to understand.
Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
@Mergifyio backport humble |
✅ Backports have been created
|
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> (cherry picked from commit ab810e7) # Conflicts: # .github/workflows/ci.yaml # Dockerfile/Dockerfile # README.md # gz_ros2_control/src/gz_ros2_control_plugin.cpp # gz_ros2_control/src/gz_system.cpp # gz_ros2_control_demos/config/gripper_controller.yaml # gz_ros2_control_demos/examples/example_gripper.cpp # gz_ros2_control_demos/launch/cart_example_effort.launch.py # gz_ros2_control_demos/launch/cart_example_position.launch.py # gz_ros2_control_demos/launch/cart_example_velocity.launch.py # gz_ros2_control_demos/launch/diff_drive_example.launch.py # gz_ros2_control_demos/launch/gripper_mimic_joint_example.launch.py # gz_ros2_control_demos/launch/tricycle_drive_example.launch.py # gz_ros2_control_demos/package.xml # gz_ros2_control_demos/urdf/test_gripper_mimic_joint.xacro.urdf # ign_ros2_control/package.xml
Signed-off-by: ahcorde ahcorde@gmail.com
Renamed
ign
togz