Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

d09ec92e

Commit d09ec92e authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into armem/dev

parents 7dd1cd3b 10a5633f

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.h 2 additions, 2 deletions

...onents/armem/server/RobotSensorMemory/RobotSensorMemory.h
source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/PoseWidget.cpp 2 additions, 1 deletion

...botAPI/gui-plugins/ArVizDrawerGui/Elements/PoseWidget.cpp
source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/PoseWidget.ui 91 additions, 62 deletions

...obotAPI/gui-plugins/ArVizDrawerGui/Elements/PoseWidget.ui
source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.cpp 17 additions, 9 deletions

...otAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.cpp
source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui 142 additions, 79 deletions

...botAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui
source/RobotAPI/gui-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h 1 addition, 1 deletion

...i-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.h 1 addition, 0 deletions

...PINJointControllers/DMPController/NJointJSDMPController.h
source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp 1 addition, 1 deletion

...tAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp

with 257 additions and 155 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