Skip to content

Commit

Permalink
simulation/gz_bridge: follow model in gz GUI (#22808)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaeyoung-Lim authored Aug 21, 2024
1 parent b2f6636 commit ae16556
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 8 deletions.
118 changes: 110 additions & 8 deletions src/modules/simulation/gz_bridge/GZBridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,31 @@ int GZBridge::init()

// If PX4_GZ_STANDALONE has been set, you can try to connect but GZ_SIM_RESOURCE_PATH needs to be set correctly to work.
else {
if (_node.Request(create_service, req, 1000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("EntityFactory service call failed.");
return PX4_ERROR;
}

} else {
PX4_ERR("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
if (!callEntityFactoryService(create_service, req)) {
return PX4_ERROR;
}

std::string scene_info_service = "/world/default/scene/info";
bool scene_created = false;

while (scene_created == false) {
if (!callSceneInfoMsgService(scene_info_service)) {
PX4_WARN("Service call timed out as Gazebo has not been detected.");
system_usleep(2000000);

} else {
scene_created = true;
}
}

gz::msgs::StringMsg follow_msg{};
follow_msg.set_data(_model_name);
bool call_string_service = callStringMsgService("/gui/follow", follow_msg);
gz::msgs::Vector3d follow_offset_msg{};
follow_offset_msg.set_x(-2.0);
follow_offset_msg.set_y(-2.0);
follow_offset_msg.set_z(2.0);
callVector3dService("/gui/follow/offset", follow_offset_msg);
}
}

Expand Down Expand Up @@ -829,6 +844,93 @@ void GZBridge::laserScanCallback(const gz::msgs::LaserScan &scan)
_obstacle_distance_pub.publish(obs);
}

bool GZBridge::callEntityFactoryService(const std::string &service, const gz::msgs::EntityFactory &req)
{
bool result;
gz::msgs::Boolean rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("EntityFactory service call failed.");
return false;
}

} else {
PX4_ERR("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
return false;
}

return true;
}

bool GZBridge::callSceneInfoMsgService(const std::string &service)
{
bool result;
gz::msgs::Empty req;
gz::msgs::Scene rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (!result) {
PX4_ERR("Scene Info service call failed.");
return false;

} else {
return true;
}

} else {
PX4_ERR("Service call timed out. Check GZ_SIM_RESOURCE_PATH is set correctly.");
return false;
}

return true;
}

bool GZBridge::callStringMsgService(const std::string &service, const gz::msgs::StringMsg &req)
{
bool result;

gz::msgs::Boolean rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("String service call failed");
return false;

}
}

else {
PX4_ERR("Service call timed out: %s", service.c_str());
return false;
}

return true;
}

bool GZBridge::callVector3dService(const std::string &service, const gz::msgs::Vector3d &req)
{
bool result;

gz::msgs::Boolean rep;

if (_node.Request(service, req, 1000, rep, result)) {
if (!rep.data() || !result) {
PX4_ERR("String service call failed");
return false;

}
}

else {
PX4_ERR("Service call timed out: %s", service.c_str());
return false;
}

return true;
}


void GZBridge::rotateQuaternion(gz::math::Quaterniond &q_FRD_to_NED, const gz::math::Quaterniond q_FLU_to_ENU)
{
// FLU (ROS) to FRD (PX4) static rotation
Expand Down
41 changes: 41 additions & 0 deletions src/modules/simulation/gz_bridge/GZBridge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
#include <gz/msgs/model.pb.h>
#include <gz/msgs/odometry_with_covariance.pb.h>
#include <gz/msgs/laserscan.pb.h>
#include <gz/msgs/stringmsg.pb.h>
#include <gz/msgs/scene.pb.h>

using namespace time_literals;

Expand Down Expand Up @@ -110,6 +112,45 @@ class GZBridge : public ModuleBase<GZBridge>, public ModuleParams, public px4::S
void navSatCallback(const gz::msgs::NavSat &nav_sat);
void laserScanCallback(const gz::msgs::LaserScan &scan);

/**
* @brief Call Entityfactory service
*
* @param req
* @return true
* @return false
*/
bool callEntityFactoryService(const std::string &service, const gz::msgs::EntityFactory &req);


/**
* @brief Call scene info service
*
* @param service
* @param req
* @return true
* @return false
*/
bool callSceneInfoMsgService(const std::string &service);

/**
* @brief Call String service
*
* @param service
* @param req
* @return true
* @return false
*/
bool callStringMsgService(const std::string &service, const gz::msgs::StringMsg &req);

/**
* @brief Call Vector3d Service
*
* @param service
* @param req
* @return true
* @return false
*/
bool callVector3dService(const std::string &service, const gz::msgs::Vector3d &req);
/**
*
* Convert a quaterion from FLU_to_ENU frames (ROS convention)
Expand Down

1 comment on commit ae16556

@slgrobotics
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jaeyoung-Lim - src/modules/simulation/gz_bridge/GZBridge.cpp line 172 - unused variable 'call_string_service' - compilation error while trying to build GZ sim on a PC. Any plans to fix this?

Please sign in to comment.