diff --git a/talos_bringup/launch/talos_preload_libraries.launch b/talos_bringup/launch/talos_preload_libraries.launch new file mode 100644 index 0000000000000000000000000000000000000000..897f355f95c4fac5c3e3abf6d798043a6df1f766 --- /dev/null +++ b/talos_bringup/launch/talos_preload_libraries.launch @@ -0,0 +1,10 @@ +<launch> + + <include file="$(find talos_controller_configuration)/launch/talos_default_controllers.launch" /> + + <include file="$(find talos_controller_configuration)/launch/full_body_position_controllers.launch" /> + + <include file="$(find talos_walking)/launch/walking_controller.launch" /> + +</launch> + diff --git a/talos_controller_configuration/launch/full_body_position_controllers.launch b/talos_controller_configuration/launch/full_body_position_controllers.launch index 53f34d5dcf54da36974c1942e20c464ab8afa90d..271b94b5e0fe762d2a228193b48b15a193128cc8 100644 --- a/talos_controller_configuration/launch/full_body_position_controllers.launch +++ b/talos_controller_configuration/launch/full_body_position_controllers.launch @@ -12,7 +12,7 @@ left_gripper_controller right_gripper_controller left_leg_controller - right_leg_controller" /> + right_leg_controller --stopped" /> <!-- Point head action --> <group ns="head_controller"> diff --git a/talos_description/robots/talos_full.urdf.xacro b/talos_description/robots/talos_full.urdf.xacro index 88ec02537bff568c8ee54e267a2638960d233a43..eeef7f0847e20be9f4e305b91542526735a93eac 100644 --- a/talos_description/robots/talos_full.urdf.xacro +++ b/talos_description/robots/talos_full.urdf.xacro @@ -30,8 +30,8 @@ <xacro:ft_sensor name="wrist" parent="arm_right_7_link" side="right" reflect="1" /> <xacro:ft_sensor name="wrist" parent="arm_left_7_link" side="left" reflect="-1" /> - <xacro:talos_gripper name="left_gripper" parent="wrist_left_ft_tool_link"/> - <xacro:talos_gripper name="right_gripper" parent="wrist_right_ft_tool_link"/> + <xacro:talos_gripper name="gripper_left" parent="wrist_left_ft_tool_link"/> + <xacro:talos_gripper name="gripper_right" parent="wrist_right_ft_tool_link"/> <xacro:talos_leg prefix="left" reflect="1" /> <xacro:talos_leg prefix="right" reflect="-1" /> diff --git a/talos_description/urdf/head/head.transmission.xacro b/talos_description/urdf/head/head.transmission.xacro index a3148f574b014b49abfb3383183e8c9d3364d9a2..86523476cb3ee1d4633aea70c54e11e5a43f8309 100644 --- a/talos_description/urdf/head/head.transmission.xacro +++ b/talos_description/urdf/head/head.transmission.xacro @@ -13,7 +13,7 @@ <xacro:macro name="talos_head_differential_transmission" params="name number1 number2 act_reduction1 act_reduction2 jnt_reduction1 jnt_reduction2" > <transmission name="talos_trans"> - <type>transmission_interface/DifferentialTransmission</type> + <type>transmission_interface/HalfDifferentialTransmission</type> <actuator name="${name}_${number1}_motor"> <role>actuator1</role> <mechanicalReduction>${act_reduction1}</mechanicalReduction>