Merge branch 'capture_passby_sensor' (fe72f437) · Commits · mobile_robotics / wolf_projects / wolf_lib / wolf · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

wolf
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

fe72f437

Commit fe72f437 authored 8 years ago by Joan Solà Ortega

Downloads
- Plain Diff

Merge branch 'capture_passby_sensor'

Conflicts:
	src/capture_base.cpp
	src/capture_base.h
	src/examples/test_image.cpp

parents 7f6f7889 14660fa6

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/capture_base.cpp 20 additions, 9 deletions

src/capture_base.cpp
src/capture_base.h 27 additions, 2 deletions

src/capture_base.h
src/capture_laser_2D.h 8 additions, 0 deletions

src/capture_laser_2D.h
src/examples/test_ROI_ORB.cpp 6 additions, 6 deletions

src/examples/test_ROI_ORB.cpp
src/examples/test_image.cpp 9 additions, 2 deletions

src/examples/test_image.cpp
src/examples/test_mpu.cpp 2 additions, 1 deletion

src/examples/test_mpu.cpp
src/examples/test_opencv.cpp 1 addition, 1 deletion

src/examples/test_opencv.cpp
src/examples/test_processor_image_landmark.cpp 4 additions, 2 deletions

src/examples/test_processor_image_landmark.cpp
src/examples/test_processor_imu.cpp 2 additions, 1 deletion

src/examples/test_processor_imu.cpp
src/examples/test_processor_odom_3D.cpp 3 additions, 1 deletion

src/examples/test_processor_odom_3D.cpp
src/sensor_base.h 15 additions, 0 deletions

src/sensor_base.h

with 97 additions and 25 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