Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

333b835e

Commit 333b835e authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

parents b7c215ff c703ea19

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h 2 additions, 2 deletions

...s/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h
source/RobotAPI/components/ViewSelection/ViewSelection.cpp 52 additions, 4 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.cpp
source/RobotAPI/components/ViewSelection/ViewSelection.h 5 additions, 2 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.h
source/RobotAPI/components/units/ATINetFTUnit.cpp 108 additions, 100 deletions

source/RobotAPI/components/units/ATINetFTUnit.cpp
source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.cpp 12 additions, 22 deletions

source/RobotAPI/drivers/WeissHapticSensor/TactileSensor.cpp
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp 6 additions, 2 deletions

.../SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h 4 additions, 0 deletions

...ns/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
source/RobotAPI/interface/components/ViewSelectionInterface.ice 2 additions, 2 deletions

.../RobotAPI/interface/components/ViewSelectionInterface.ice
source/RobotAPI/libraries/core/FramedPose.h 18 additions, 0 deletions

source/RobotAPI/libraries/core/FramedPose.h
source/RobotAPI/libraries/core/LinkedPose.h 5 additions, 0 deletions

source/RobotAPI/libraries/core/LinkedPose.h
source/RobotAPI/libraries/core/math/Trigonometry.h 2 additions, 2 deletions

source/RobotAPI/libraries/core/math/Trigonometry.h

with 216 additions and 136 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