Skip to content
Snippets Groups Projects
Commit eb6abfd3 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Updated the launch files.

parent 20b97ebf
No related branches found
No related tags found
No related merge requests found
<launch> <launch>
<!-- launch the play motion client node --> <!-- launch the play motion client node -->
<node name="play_motion_client" <node name="tiago_play_motion_client"
pkg="play_motion_client" pkg="tiago_play_motion_module"
type="play_motion_client" type="tiago_play_motion_client"
output="screen" output="screen"
ns="/tiago"> ns="/tiago">
<remap from="~/play_motion_module/play_motion" <remap from="~/play_motion_module/play_motion"
to="/play_motion"/> to="/play_motion"/>
<rosparam file="$(find tiago_modules)/config/play_motion_module_default.yaml" command="load" ns="play_motion_module" /> <rosparam file="$(find tiago_play_motion_module)/config/tiago_play_motion_module_default.yaml" command="load" ns="play_motion_module" />
</node> </node>
<!-- launch dynamic reconfigure --> <!-- launch dynamic reconfigure -->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<arg name="robot" value="steel" /> <arg name="robot" value="steel" />
</include> </include>
<include file="$(find play_motion_client)/launch/play_motion_client.launch"/> <include file="$(find tiago_play_motion_module)/launch/tiago_play_motion_client.launch"/>
</launch> </launch>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
CTiagoPlayMotionModule::CTiagoPlayMotionModule(const std::string &name,const std::string &name_space) : CModule(name,name_space), CTiagoPlayMotionModule::CTiagoPlayMotionModule(const std::string &name,const std::string &name_space) : CModule(name,name_space),
tiago_play_motion_action("tiago_play_motion",this->module_nh.getNamespace()) tiago_play_motion_action("play_motion",this->module_nh.getNamespace())
{ {
this->start_operation(); this->start_operation();
...@@ -109,25 +109,11 @@ void CTiagoPlayMotionModule::reconfigure_callback(tiago_play_motion_module::Tiag ...@@ -109,25 +109,11 @@ void CTiagoPlayMotionModule::reconfigure_callback(tiago_play_motion_module::Tiag
void CTiagoPlayMotionModule::execute_motion(std::string motion_name) void CTiagoPlayMotionModule::execute_motion(std::string motion_name)
{ {
XmlRpc::XmlRpcValue symbols;
if(!ros::param::get(this->config.motions_param_path.c_str(), symbols))
return;
else
{
if(symbols.getType()==XmlRpc::XmlRpcValue::TypeArray)
return;
for (XmlRpc::XmlRpcValue::iterator i=symbols.begin(); i!=symbols.end(); ++i)
{
std::cout << i->second << std::endl;
}
}
/*
std::string motion; std::string motion;
if(this->is_finished()) if(this->is_finished())
{ {
if(this->module_nh.getParam("/play_motion/motions/" + motion_name + "/meta/name", motion)) //If motion exists if(this->module_nh.getParam(this->config.motions_param_path + "/" + motion_name + "/meta/name", motion)) //If motion exists
{ {
this->goal.motion_name=motion_name; this->goal.motion_name=motion_name;
this->goal.skip_planning=false; this->goal.skip_planning=false;
...@@ -139,7 +125,7 @@ void CTiagoPlayMotionModule::execute_motion(std::string motion_name) ...@@ -139,7 +125,7 @@ void CTiagoPlayMotionModule::execute_motion(std::string motion_name)
ROS_WARN("CTiagoPlayMotionModule: Motion name does not exist"); ROS_WARN("CTiagoPlayMotionModule: Motion name does not exist");
this->status=TIAGO_PLAY_MOTION_MODULE_INVALID_ID; this->status=TIAGO_PLAY_MOTION_MODULE_INVALID_ID;
} }
}*/ }
} }
void CTiagoPlayMotionModule::stop(void) void CTiagoPlayMotionModule::stop(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment