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.

Sign up for GitHub

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

Jump to bottom

Address reviews on #868 #972

Merged
merged 14 commits into from
Aug 21, 2019
Merged

Address reviews on #868 #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f9a7798
[ros2] World plugin to get/set entity state services (#839)
chapulina Feb 14, 2019
eb628c9
[ros2] Port time commands (pause / reset) (#866)
chapulina Feb 15, 2019
70dd88e
[ros2] Migration of get/set world, model, joint, link, light properties
nzlz Jan 21, 2019
b5f4352
Trying to pass CI test, try n1.
nzlz Jan 21, 2019
cb891db
clean up some linter warnings
chapulina Mar 6, 2019
2d76a9b
Requested changes in review, unfinished
nzlz Mar 6, 2019
e395e5c
Fix uncrustify
nzlz Mar 6, 2019
52b1108
Merge branch 'ros2_properties' on 'properties'
shiveshkhaitan Aug 5, 2019
5a43460
Address reviews
shiveshkhaitan Aug 6, 2019
b2b021b
Merge branch 'dashing' into properties
shiveshkhaitan Aug 8, 2019
2bb0d58
Merge branch 'dashing' into properties
shiveshkhaitan Aug 11, 2019
5293a5a
more tests, joint types
chapulina Aug 15, 2019
aac7178
Revert changes to GetModelProperties message
shiveshkhaitan Aug 20, 2019
f0e9796
Convert msgs pose to math pose and use it on SetCoG
chapulina Aug 21, 2019
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
43 changes: 0 additions & 43 deletions .ros1_unported/gazebo_ros/include/gazebo_ros/gazebo_ros_api_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,9 @@
#include "gazebo_msgs/SetPhysicsProperties.h"
#include "gazebo_msgs/GetPhysicsProperties.h"

#include "gazebo_msgs/SetJointProperties.h"

#include "gazebo_msgs/GetWorldProperties.h"

#include "gazebo_msgs/GetModelProperties.h"

#include "gazebo_msgs/GetJointProperties.h"
#include "gazebo_msgs/ApplyJointEffort.h"

#include "gazebo_msgs/GetLinkProperties.h"
#include "gazebo_msgs/SetLinkProperties.h"

#include "gazebo_msgs/GetLightProperties.h"
#include "gazebo_msgs/SetLightProperties.h"

// Topics
#include "geometry_msgs/Vector3.h"
Expand Down Expand Up @@ -117,36 +106,12 @@ class GazeboRosApiPlugin : public SystemPlugin
/// \brief advertise services
void advertiseServices();

/// \brief
bool getModelProperties(gazebo_msgs::GetModelProperties::Request &req,gazebo_msgs::GetModelProperties::Response &res);

/// \brief
bool getWorldProperties(gazebo_msgs::GetWorldProperties::Request &req,gazebo_msgs::GetWorldProperties::Response &res);

/// \brief
bool getJointProperties(gazebo_msgs::GetJointProperties::Request &req,gazebo_msgs::GetJointProperties::Response &res);

/// \brief
bool getLinkProperties(gazebo_msgs::GetLinkProperties::Request &req,gazebo_msgs::GetLinkProperties::Response &res);

/// \brief
bool getLightProperties(gazebo_msgs::GetLightProperties::Request &req,gazebo_msgs::GetLightProperties::Response &res);

/// \brief
bool setLightProperties(gazebo_msgs::SetLightProperties::Request &req,gazebo_msgs::SetLightProperties::Response &res);

/// \brief
bool setLinkProperties(gazebo_msgs::SetLinkProperties::Request &req,gazebo_msgs::SetLinkProperties::Response &res);

/// \brief
bool setPhysicsProperties(gazebo_msgs::SetPhysicsProperties::Request &req,gazebo_msgs::SetPhysicsProperties::Response &res);

/// \brief
bool getPhysicsProperties(gazebo_msgs::GetPhysicsProperties::Request &req,gazebo_msgs::GetPhysicsProperties::Response &res);

/// \brief
bool setJointProperties(gazebo_msgs::SetJointProperties::Request &req,gazebo_msgs::SetJointProperties::Response &res);

/// \brief
bool applyJointEffort(gazebo_msgs::ApplyJointEffort::Request &req,gazebo_msgs::ApplyJointEffort::Response &res);

Expand Down Expand Up @@ -215,17 +180,9 @@ class GazeboRosApiPlugin : public SystemPlugin
gazebo::event::ConnectionPtr time_update_event_;
gazebo::event::ConnectionPtr load_gazebo_ros_api_plugin_event_;

ros::ServiceServer get_model_properties_service_;
ros::ServiceServer get_world_properties_service_;
ros::ServiceServer get_joint_properties_service_;
ros::ServiceServer get_link_properties_service_;
ros::ServiceServer get_light_properties_service_;
ros::ServiceServer set_light_properties_service_;
ros::ServiceServer set_link_properties_service_;
ros::ServiceServer set_physics_properties_service_;
ros::ServiceServer get_physics_properties_service_;
ros::ServiceServer apply_body_wrench_service_;
ros::ServiceServer set_joint_properties_service_;
ros::ServiceServer apply_joint_effort_service_;
ros::ServiceServer set_model_configuration_service_;
ros::ServiceServer clear_joint_forces_service_;
Expand Down
Loading