Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

D

dynamic_graph_bridge
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6e591a31

Commit 6e591a31 authored 8 years ago by Olivier Stasse

Downloads
- Plain Diff

Merge branch 'devel' into topic/merge

Conflicts:
	CMakeLists.txt
	cmake
	include/dynamic_graph_bridge/sot_loader.hh
	package.xml
	src/sot_loader.cpp

parents 9b5e767a 695166d6

No related branches found

No related tags found

Loading

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

.version 1 addition, 0 deletions

.version
CMakeLists.txt 38 additions, 17 deletions

CMakeLists.txt
cmake 1 addition, 1 deletion

cmake
include/dynamic_graph_bridge/sot_loader.hh 5 additions, 0 deletions

include/dynamic_graph_bridge/sot_loader.hh
package.xml 1 addition, 1 deletion

package.xml
scripts/robot_pose_publisher 1 addition, 0 deletions

scripts/robot_pose_publisher
src/converter.hh 50 additions, 56 deletions

src/converter.hh
src/dynamic_graph/ros/__init__.py 25 additions, 3 deletions

src/dynamic_graph/ros/__init__.py
src/geometric_simu.cpp 1 addition, 3 deletions

src/geometric_simu.cpp
src/robot_model.cpp 71 additions, 86 deletions

src/robot_model.cpp
src/robot_model.hh 5 additions, 3 deletions

src/robot_model.hh
src/ros_joint_state.cpp 29 additions, 33 deletions

src/ros_joint_state.cpp
src/ros_joint_state.hh 1 addition, 1 deletion

src/ros_joint_state.hh
src/ros_publish.cpp 9 additions, 6 deletions

src/ros_publish.cpp
src/ros_publish.hxx 4 additions, 4 deletions

src/ros_publish.hxx
src/ros_subscribe.cpp 5 additions, 5 deletions

src/ros_subscribe.cpp
src/ros_subscribe.hh 1 addition, 1 deletion

src/ros_subscribe.hh
src/ros_subscribe.hxx 4 additions, 4 deletions

src/ros_subscribe.hxx
src/sot_loader.cpp 35 additions, 4 deletions

src/sot_loader.cpp
src/sot_to_ros.cpp 5 additions, 5 deletions

src/sot_to_ros.cpp

with 292 additions and 233 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment