Skip to content

Commit 6b505ac

Browse files
authored
Merge pull request #262 from fmessmer/debug_cart_vel_recursive
publish cart vel magnitudes for frames of chain
2 parents c652fcc + d32cf9e commit 6b505ac

File tree

5 files changed

+279
-142
lines changed

5 files changed

+279
-142
lines changed

cob_twist_controller/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0.2)
22
project(cob_twist_controller)
33

4-
find_package(catkin REQUIRED COMPONENTS cmake_modules cob_control_msgs cob_srvs dynamic_reconfigure eigen_conversions geometry_msgs kdl_conversions kdl_parser nav_msgs pluginlib roscpp roslint sensor_msgs std_msgs tf tf_conversions trajectory_msgs urdf visualization_msgs)
4+
find_package(catkin REQUIRED COMPONENTS cmake_modules cob_control_msgs cob_srvs control_msgs dynamic_reconfigure eigen_conversions geometry_msgs kdl_conversions kdl_parser nav_msgs pluginlib roscpp roslint sensor_msgs std_msgs tf tf_conversions trajectory_msgs urdf visualization_msgs)
55

66
find_package(Boost REQUIRED COMPONENTS thread)
77

@@ -17,7 +17,7 @@ generate_dynamic_reconfigure_options(
1717
)
1818

1919
catkin_package(
20-
CATKIN_DEPENDS cob_control_msgs cob_srvs dynamic_reconfigure eigen_conversions geometry_msgs kdl_conversions kdl_parser nav_msgs pluginlib roscpp sensor_msgs std_msgs tf tf_conversions trajectory_msgs urdf visualization_msgs
20+
CATKIN_DEPENDS cob_control_msgs cob_srvs control_msgs dynamic_reconfigure eigen_conversions geometry_msgs kdl_conversions kdl_parser nav_msgs pluginlib roscpp sensor_msgs std_msgs tf tf_conversions trajectory_msgs urdf visualization_msgs
2121
DEPENDS Boost
2222
INCLUDE_DIRS include
2323
LIBRARIES damping_methods inv_calculations constraint_solvers limiters controller_interfaces kinematic_extensions inverse_differential_kinematics_solver twist_controller
@@ -73,9 +73,9 @@ add_executable(debug_trajectory_marker_node src/debug/debug_trajectory_marker_no
7373
add_dependencies(debug_trajectory_marker_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
7474
target_link_libraries(debug_trajectory_marker_node ${catkin_LIBRARIES})
7575

76-
add_executable(debug_evaluate_jointstates_node src/debug/debug_evaluate_jointstates_node.cpp)
77-
add_dependencies(debug_evaluate_jointstates_node ${catkin_EXPORTED_TARGETS})
78-
target_link_libraries(debug_evaluate_jointstates_node ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
76+
add_executable(debug_fk_vel_recursive_node src/debug/debug_fk_vel_recursive_node.cpp)
77+
add_dependencies(debug_fk_vel_recursive_node ${catkin_EXPORTED_TARGETS})
78+
target_link_libraries(debug_fk_vel_recursive_node ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
7979

8080
add_executable(test_moving_average_node src/debug/test_moving_average_node.cpp)
8181
add_dependencies(test_moving_average_node ${catkin_EXPORTED_TARGETS})
@@ -106,7 +106,7 @@ install(TARGETS ${PROJECT_NAME}_node constraint_solvers controller_interfaces da
106106
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
107107
)
108108

109-
install(TARGETS debug_evaluate_jointstates_node debug_trajectory_marker_node test_moving_average_node test_simpson_integrator_node test_trajectory_command_sine_node test_twist_command_sine_node
109+
install(TARGETS debug_fk_vel_recursive_node debug_trajectory_marker_node test_moving_average_node test_simpson_integrator_node test_trajectory_command_sine_node test_twist_command_sine_node
110110
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
111111
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
112112
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
<launch>
3+
4+
<arg name="component"/>
5+
<arg name="chain_base_link"/>
6+
<arg name="chain_tip_link"/>
7+
8+
<group ns="$(arg component)">
9+
<param name="chain_base_link" type="str" value="$(arg chain_base_link)"/>
10+
<param name="chain_tip_link" type="str" value="$(arg chain_tip_link)"/>
11+
<node name="debug_fk_vel_recursive_node" pkg="cob_twist_controller" type="debug_fk_vel_recursive_node" cwd="node" respawn="false" output="screen"/>
12+
</group>
13+
14+
</launch>

cob_twist_controller/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<depend>cmake_modules</depend>
3232
<depend>cob_control_msgs</depend>
3333
<depend>cob_srvs</depend>
34+
<depend>control_msgs</depend>
3435
<depend>dynamic_reconfigure</depend>
3536
<depend>eigen_conversions</depend>
3637
<depend>eigen</depend>

cob_twist_controller/src/debug/debug_evaluate_jointstates_node.cpp

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)