Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

4313d831

Commit 4313d831 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'armem/dev'

Conflicts:
	source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp

parents 81b6b19a eb877c52

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.cpp 24 additions, 30 deletions

...otReaderExampleClient/VirtualRobotReaderExampleClient.cpp
source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.h 9 additions, 1 deletion

...obotReaderExampleClient/VirtualRobotReaderExampleClient.h
source/RobotAPI/libraries/armem/client/query/query_fns.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem/client/query/query_fns.h
source/RobotAPI/libraries/armem/client/query/selectors.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem/client/query/selectors.h
source/RobotAPI/libraries/armem/server/query_proc/base/EntityQueryProcessorBase.h 91 additions, 23 deletions

...s/armem/server/query_proc/base/EntityQueryProcessorBase.h
source/RobotAPI/libraries/armem/test/ArMemQueryTest.cpp 259 additions, 0 deletions

source/RobotAPI/libraries/armem/test/ArMemQueryTest.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 2 additions, 2 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 0 additions, 1 deletion

...ries/armem_robot_state/client/common/VirtualRobotReader.h
source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp 1 addition, 1 deletion

...armem_robot_state/client/localization/TransformReader.cpp

with 388 additions and 60 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