Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

3eb196f8

Commit 3eb196f8 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'fix/virtual-robot-error-handling' into 'master'

(Virtual) robot reader: waiting until data is available

See merge request ArmarX/RobotAPI!220

parents ce7c5f52 7a32edf9

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 40 additions, 9 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 15 additions, 8 deletions

...I/libraries/armem_robot_state/client/common/RobotReader.h
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 40 additions, 19 deletions

...es/armem_robot_state/client/common/VirtualRobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 5 additions, 4 deletions

...ries/armem_robot_state/client/common/VirtualRobotReader.h

with 100 additions and 40 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