Skip to content
Snippets Groups Projects
Commit 62a209ce authored by Johannes Mey's avatar Johannes Mey
Browse files

align with ros melodic, change arm controller name in initializer

parent a640a57d
No related branches found
No related tags found
No related merge requests found
<launch> <launch>
<param name="robot_description" command="$(find xacro)/xacro $(find franka_description)/robots/panda_arm_hand.urdf.xacro" />
<!-- GAZEBO arguments --> <!-- GAZEBO arguments -->
<arg name="paused" default="false" /> <arg name="paused" default="false" />
...@@ -9,6 +8,11 @@ ...@@ -9,6 +8,11 @@
<arg name="debug" default="false" /> <arg name="debug" default="false" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<!-- don't include franka_control, but include the controller stuff from there -->
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find franka_description)/robots/panda_arm_hand.urdf.xacro'" if="$(arg load_gripper)" />
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find franka_description)/robots/panda_arm.urdf.xacro'" unless="$(arg load_gripper)" />
<rosparam command="load" file="$(find franka_control)/config/default_controllers.yaml" />
<!--launch GAZEBO with own world configuration --> <!--launch GAZEBO with own world configuration -->
<include file="$(find gazebo_ros)/launch/empty_world.launch"> <include file="$(find gazebo_ros)/launch/empty_world.launch">
<!-- <arg name="world_name" value="$(find robotics_assisted_tomography)/worlds/tomography.world"/> --> <!-- <arg name="world_name" value="$(find robotics_assisted_tomography)/worlds/tomography.world"/> -->
...@@ -19,8 +23,6 @@ ...@@ -19,8 +23,6 @@
<arg name="headless" value="$(arg headless)" /> <arg name="headless" value="$(arg headless)" />
</include> </include>
<node name="rqt_console" pkg="rqt_console" type="rqt_console" />
<!-- <node name="rqt_logger_level" pkg="rqt_logger_level" type="rqt_logger_level" /> -->
<node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model panda" /> <node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model panda" />
...@@ -28,7 +30,7 @@ ...@@ -28,7 +30,7 @@
<rosparam file="$(find panda_simulation)/config/panda_control.yaml" command="load" /> <rosparam file="$(find panda_simulation)/config/panda_control.yaml" command="load" />
<!-- load the controllers --> <!-- load the controllers -->
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="joint_state_controller panda_arm_controller" /> <node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="joint_state_controller position_joint_trajectory_controller" />
<node if="$(arg load_gripper)" name="controller_spawner_hand" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="panda_hand_controller" /> <node if="$(arg load_gripper)" name="controller_spawner_hand" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="panda_hand_controller" />
...@@ -57,14 +59,7 @@ ...@@ -57,14 +59,7 @@
<!-- run custom node for automatic intialization --> <!-- run custom node for automatic intialization -->
<node pkg="panda_simulation" type="robot_state_initializer_node" name="robot_state_initializer_node" /> <node pkg="panda_simulation" type="robot_state_initializer_node" name="robot_state_initializer_node" />
<!--<node name="move_group_interface_tutorial" pkg="panda_simulation" type="move_group_interface_tutorial" respawn="false" output="screen"/>-->
<node name="constraint_planner" pkg="panda_simulation" type="constraint_planner" respawn="false" output="screen"/> <node name="constraint_planner" pkg="panda_simulation" type="constraint_planner" respawn="false" output="screen"/>
<!--<node name="motion_planning_api_tutorial" pkg="panda_simulation" type="motion_planning_api_tutorial" respawn="false" output="screen">
<rosparam command="load" file="$(find panda_moveit_config)/config/kinematics.yaml"/>
<param name="/planning_plugin" value="ompl_interface/OMPLPlanner"/>
<rosparam command="load" file="$(find panda_moveit_config)/config/ompl_planning.yaml"/>
</node>-->
</launch> </launch>
...@@ -20,7 +20,7 @@ int main(int argc, char **argv) { ...@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
ros::Duration(2.0).sleep(); ros::Duration(2.0).sleep();
// 1. switch from default joint trajectory controller to custom position controller // 1. switch from default joint trajectory controller to custom position controller
std::string panda_arm_controller{"panda_arm_controller"}, panda_hand_controller{"panda_hand_controller"}, std::string panda_arm_controller{"position_joint_trajectory_controller"}, panda_hand_controller{"panda_hand_controller"},
joint_position_controller{"joint_position_controller"}; joint_position_controller{"joint_position_controller"};
std::vector<std::string> stop_controllers{panda_arm_controller, panda_hand_controller}; std::vector<std::string> stop_controllers{panda_arm_controller, panda_hand_controller};
std::vector<std::string> start_controllers{joint_position_controller}; std::vector<std::string> start_controllers{joint_position_controller};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment