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

ROS2: boostrap repo and convert gazebo_msgs #769

Merged
merged 3 commits into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
Empty file.
File renamed without changes.
125 changes: 66 additions & 59 deletions gazebo_msgs/CMakeLists.txt
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()
2 changes: 1 addition & 1 deletion gazebo_msgs/msg/ContactsState.msg
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
4 changes: 2 additions & 2 deletions gazebo_msgs/msg/ODEJointProperties.msg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# access to low level joint properties, change these at your own risk
float64[] damping # joint damping
float64[] hiStop # joint limit
float64[] loStop # joint limit
float64[] hi_stop # joint limit
float64[] lo_stop # joint limit
float64[] erp # set joint erp
float64[] cfm # set joint cfm
float64[] stop_erp # set joint erp for joint limit "contact" joint
Expand Down
2 changes: 1 addition & 1 deletion gazebo_msgs/msg/WorldState.msg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# * visual information - does not vary in time
#

Header header
std_msgs/Header header

string[] name
geometry_msgs/Pose[] pose
Expand Down
33 changes: 16 additions & 17 deletions gazebo_msgs/package.xml
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>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<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>
4 changes: 2 additions & 2 deletions gazebo_msgs/srv/ApplyBodyWrench.srv
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ string reference_frame # wrench is defined in the reference f
# frame names are bodies prefixed by model name, e.g. pr2::base_link
geometry_msgs/Point reference_point # wrench is defined at this location in the reference frame
geometry_msgs/Wrench wrench # wrench applied to the origin of the body
time start_time # (optional) wrench application start time (seconds)
builtin_interfaces/Time start_time # (optional) wrench application start time (seconds)
# if start_time is not specified, or
# start_time < current time, start as soon as possible
duration duration # optional duration of wrench application time (seconds)
builtin_interfaces/Duration duratio # optional duration of wrench application time (seconds)
# if duration < 0, apply wrench continuously without end
# if duration = 0, do nothing
# if duration < step size, apply wrench
Expand Down
22 changes: 11 additions & 11 deletions gazebo_msgs/srv/ApplyJointEffort.srv
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
2 changes: 1 addition & 1 deletion gazebo_msgs/srv/GetModelState.srv
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ string relative_entity_name # return pose and twist relative to this en
# be sure to use gazebo scoped naming notation (e.g. [model_name::body_name])
# leave empty or "world" will use inertial world frame
---
Header header # Standard metadata for higher-level stamped data types.
std_msgs/Header header # Standard metadata for higher-level stamped data types.
# * header.seq holds the number of requests since the plugin started
# * header.stamp timestamp related to the pose
# * header.frame_id not used but currently filled with the relative_entity_name
Expand Down