Merge branch 'smart_charger' of... (c4e803d0) · Commits · humanoides / humanoid_common · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

humanoid_common
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

c4e803d0

Commit c4e803d0 authored 7 years ago by Irene Garcia Camacho

Downloads
- Plain Diff

Merge branch 'smart_charger' of...

Merge branch 'smart_charger' of https://gitlab.iri.upc.edu/humanoides/humanoid_common into smart_charger

parents 43e9061f 40364ab9

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

qr_head_tracking/CMakeLists.txt 5 additions, 2 deletions

qr_head_tracking/CMakeLists.txt
qr_head_tracking/include/qr_head_tracking_alg_node.h 3 additions, 29 deletions

qr_head_tracking/include/qr_head_tracking_alg_node.h
qr_head_tracking/package.xml 5 additions, 8 deletions

qr_head_tracking/package.xml
qr_head_tracking/src/qr_head_tracking_alg_node.cpp 12 additions, 172 deletions

qr_head_tracking/src/qr_head_tracking_alg_node.cpp
teleop/CMakeLists.txt 5 additions, 2 deletions

teleop/CMakeLists.txt
teleop/include/teleop_alg_node.h 10 additions, 48 deletions

teleop/include/teleop_alg_node.h
teleop/launch/teleop.launch 23 additions, 11 deletions

teleop/launch/teleop.launch
teleop/launch/teleop_sim.launch 23 additions, 11 deletions

teleop/launch/teleop_sim.launch
teleop/package.xml 2 additions, 10 deletions

teleop/package.xml
teleop/src/teleop_alg_node.cpp 49 additions, 343 deletions

teleop/src/teleop_alg_node.cpp

with 137 additions and 636 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