Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

cd1d440f

Commit cd1d440f authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'bug/160/clocksync' into 'master'

Resolves #160 by resync of clock

Closes #160

See merge request nicolas.pope/ftl!97

parents 18ee4fa7 c6bf08c3

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

components/common/cpp/include/ftl/timer.hpp 5 additions, 1 deletion

components/common/cpp/include/ftl/timer.hpp
components/common/cpp/src/timer.cpp 30 additions, 5 deletions

components/common/cpp/src/timer.cpp
components/common/cpp/test/timer_unit.cpp 84 additions, 11 deletions

components/common/cpp/test/timer_unit.cpp
components/rgbd-sources/include/ftl/rgbd/streamer.hpp 2 additions, 0 deletions

components/rgbd-sources/include/ftl/rgbd/streamer.hpp
components/rgbd-sources/src/group.cpp 7 additions, 3 deletions

components/rgbd-sources/src/group.cpp
components/rgbd-sources/src/streamer.cpp 28 additions, 10 deletions

components/rgbd-sources/src/streamer.cpp

with 156 additions and 30 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