Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

dda5dda5

Commit dda5dda5 authored 7 years ago by Armar6Demo

Downloads
- Plain Diff

Merge branch 'master' into RT-Logging

parents c3e5a7ab 48e767c0

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp 4 additions, 3 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueForceTorque.h 5 additions, 0 deletions

...nts/units/RobotUnit/SensorValues/SensorValueForceTorque.h
source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.cpp 21 additions, 12 deletions

...API/components/units/RobotUnit/Units/KinematicSubUnit.cpp
source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.h 5 additions, 1 deletion

...otAPI/components/units/RobotUnit/Units/KinematicSubUnit.h
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 1 addition, 2 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp

with 36 additions and 18 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