-
Notifications
You must be signed in to change notification settings - Fork 775
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
ROS2: boostrap repo and convert gazebo_msgs #769
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,68 +1,75 @@ | ||
cmake_minimum_required(VERSION 2.8.3) | ||
cmake_minimum_required(VERSION 3.5) | ||
|
||
project(gazebo_msgs) | ||
|
||
find_package(catkin REQUIRED COMPONENTS | ||
std_msgs | ||
trajectory_msgs | ||
geometry_msgs | ||
sensor_msgs | ||
std_srvs | ||
message_generation | ||
) | ||
# Default to C++14 | ||
if(NOT CMAKE_CXX_STANDARD) | ||
set(CMAKE_CXX_STANDARD 14) | ||
endif() | ||
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||
# we dont use add_compile_options with pedantic in message packages | ||
# because the Python C extensions dont comply with it | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") | ||
endif() | ||
|
||
find_package(ament_cmake REQUIRED) | ||
find_package(builtin_interfaces REQUIRED) | ||
find_package(std_msgs REQUIRED) | ||
find_package(trajectory_msgs REQUIRED) | ||
find_package(geometry_msgs REQUIRED) | ||
find_package(rosidl_default_generators REQUIRED) | ||
|
||
set(msg_files | ||
"msg/ContactState.msg" | ||
"msg/ContactsState.msg" | ||
"msg/LinkState.msg" | ||
"msg/LinkStates.msg" | ||
"msg/ModelState.msg" | ||
"msg/ModelStates.msg" | ||
"msg/ODEJointProperties.msg" | ||
"msg/ODEPhysics.msg" | ||
"msg/WorldState.msg" | ||
) | ||
|
||
add_message_files( | ||
DIRECTORY msg | ||
FILES | ||
ContactsState.msg | ||
ContactState.msg | ||
LinkState.msg | ||
LinkStates.msg | ||
ModelState.msg | ||
ModelStates.msg | ||
ODEJointProperties.msg | ||
ODEPhysics.msg | ||
WorldState.msg | ||
) | ||
set(srv_files | ||
"srv/ApplyBodyWrench.srv" | ||
"srv/ApplyJointEffort.srv" | ||
"srv/BodyRequest.srv" | ||
"srv/DeleteLight.srv" | ||
"srv/DeleteModel.srv" | ||
"srv/GetJointProperties.srv" | ||
"srv/GetLightProperties.srv" | ||
"srv/GetLinkProperties.srv" | ||
"srv/GetLinkState.srv" | ||
"srv/GetModelProperties.srv" | ||
"srv/GetModelState.srv" | ||
"srv/GetPhysicsProperties.srv" | ||
"srv/GetWorldProperties.srv" | ||
"srv/JointRequest.srv" | ||
"srv/SetJointProperties.srv" | ||
"srv/SetJointTrajectory.srv" | ||
"srv/SetLightProperties.srv" | ||
"srv/SetLinkProperties.srv" | ||
"srv/SetLinkState.srv" | ||
"srv/SetModelConfiguration.srv" | ||
"srv/SetModelState.srv" | ||
"srv/SetPhysicsProperties.srv" | ||
"srv/SpawnModel.srv" | ||
) | ||
|
||
add_service_files(DIRECTORY srv FILES | ||
ApplyBodyWrench.srv | ||
DeleteModel.srv | ||
DeleteLight.srv | ||
GetLinkState.srv | ||
GetPhysicsProperties.srv | ||
SetJointProperties.srv | ||
SetModelConfiguration.srv | ||
SpawnModel.srv | ||
ApplyJointEffort.srv | ||
GetJointProperties.srv | ||
GetModelProperties.srv | ||
GetWorldProperties.srv | ||
SetLinkProperties.srv | ||
SetModelState.srv | ||
BodyRequest.srv | ||
GetLinkProperties.srv | ||
GetModelState.srv | ||
JointRequest.srv | ||
SetLinkState.srv | ||
SetPhysicsProperties.srv | ||
SetJointTrajectory.srv | ||
GetLightProperties.srv | ||
SetLightProperties.srv | ||
) | ||
rosidl_generate_interfaces(${PROJECT_NAME} | ||
${msg_files} | ||
${srv_files} | ||
|
||
generate_messages(DEPENDENCIES | ||
DEPENDENCIES | ||
builtin_interfaces | ||
std_msgs | ||
geometry_msgs | ||
sensor_msgs | ||
trajectory_msgs | ||
) | ||
|
||
catkin_package( | ||
CATKIN_DEPENDS | ||
message_runtime | ||
std_msgs | ||
trajectory_msgs | ||
geometry_msgs | ||
sensor_msgs | ||
std_srvs | ||
) | ||
ADD_LINTER_TESTS | ||
) | ||
|
||
ament_export_dependencies(rosidl_default_runtime) | ||
|
||
ament_package() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
Header header # stamp | ||
std_msgs/Header header # stamp | ||
gazebo_msgs/ContactState[] states # array of geom pairs in contact |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,35 @@ | ||
<?xml version="1.0"?> | ||
<package format="2"> | ||
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?> | ||
<package format="3"> | ||
<name>gazebo_msgs</name> | ||
<version>2.8.4</version> | ||
<description> | ||
Message and service data structures for interacting with Gazebo from ROS. | ||
Message and service data structures for interacting with Gazebo from ROS2. | ||
</description> | ||
|
||
<maintainer email="jrivero@osrfoundation.org">Jose Luis Rivero</maintainer> | ||
|
||
<license>BSD</license> | ||
|
||
<url type="website">http://gazebosim.org/tutorials?cat=connect_ros</url> | ||
<url type="bugtracker">/~https://github.com/ros-simulation/gazebo_ros_pkgs/issues</url> | ||
<url type="repository">/~https://github.com/ros-simulation/gazebo_ros_pkgs</url> | ||
|
||
<author>John Hsu</author> | ||
|
||
<buildtool_depend>catkin</buildtool_depend> | ||
<buildtool_depend>ament_cmake</buildtool_depend> | ||
|
||
<build_depend>rosidl_default_generators</build_depend> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Switched, that seems like the right way to do it |
||
<build_depend>builtin_interfaces</build_depend> | ||
<build_depend>geometry_msgs</build_depend> | ||
<build_depend>sensor_msgs</build_depend> | ||
<build_depend>trajectory_msgs</build_depend> | ||
<build_depend>std_msgs</build_depend> | ||
<build_depend>std_srvs</build_depend> | ||
<build_depend>message_generation</build_depend> | ||
|
||
|
||
<exec_depend>rosidl_default_runtime</exec_depend> | ||
<exec_depend>builtin_interfaces</exec_depend> | ||
<exec_depend>geometry_msgs</exec_depend> | ||
<exec_depend>sensor_msgs</exec_depend> | ||
<exec_depend>trajectory_msgs</exec_depend> | ||
<exec_depend>std_msgs</exec_depend> | ||
<exec_depend>message_runtime</exec_depend> | ||
<exec_depend>std_srvs</exec_depend> | ||
</package> | ||
|
||
<test_depend>ament_lint_common</test_depend> | ||
|
||
<member_of_group>rosidl_interface_packages</member_of_group> | ||
|
||
<export> | ||
<build_type>ament_cmake</build_type> | ||
</export> | ||
</package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
# set urdf joint effort | ||
string joint_name # joint to apply wrench (linear force and torque) | ||
float64 effort # effort to apply | ||
time start_time # optional wrench application start time (seconds) | ||
# if start_time < current time, start as soon as possible | ||
duration duration # optional duration of wrench application time (seconds) | ||
# if duration < 0, apply wrench continuously without end | ||
# if duration = 0, do nothing | ||
# if duration < step size, assume step size and | ||
# display warning in status_message | ||
string joint_name # joint to apply wrench (linear force and torque) | ||
float64 effort # effort to apply | ||
builtin_interfaces/Time start_time # optional wrench application start time (seconds) | ||
# if start_time < current time, start as soon as possible | ||
builtin_interfaces/Duration duration # optional duration of wrench application time (seconds) | ||
# if duration < 0, apply wrench continuously without end | ||
# if duration = 0, do nothing | ||
# if duration < step size, assume step size and | ||
# display warning in status_message | ||
--- | ||
bool success # return true if effort application is successful | ||
string status_message # comments if available | ||
bool success # return true if effort application is successful | ||
string status_message # comments if available |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
How do you feel about alphabetizing this list? The messages are already ok