Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

7fc5ceb3

Commit 7fc5ceb3 authored 1 year ago by Your Name

Downloads
- Plain Diff

Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

parents 389639b6 ed6b511f

No related branches found

No related tags found

1 merge request!354Feature/armen laser scans update inc intensity

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/RobotHealth/RobotHealth.cpp 35 additions, 17 deletions

source/RobotAPI/components/RobotHealth/RobotHealth.cpp
source/RobotAPI/components/RobotHealth/RobotHealth.h 11 additions, 1 deletion

source/RobotAPI/components/RobotHealth/RobotHealth.h
source/RobotAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidgetController.cpp 31 additions, 6 deletions

...ugins/GuiHealthClient/GuiHealthClientWidgetController.cpp
source/RobotAPI/interface/components/RobotHealthInterface.ice 10 additions, 1 deletion

...ce/RobotAPI/interface/components/RobotHealthInterface.ice

with 87 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