Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

8e917468

Commit 8e917468 authored 10 years ago by Nikolaus Vahrenkamp

Downloads
- Plain Diff

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

parents 3538226f c5f59acf

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/ForceTorqueObserver.cpp 2 additions, 4 deletions

source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/components/units/TCPControlUnit.cpp 2 additions, 0 deletions

source/RobotAPI/components/units/TCPControlUnit.cpp
source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.cpp 98 additions, 2 deletions

...I/libraries/core/checks/ConditionCheckMagnitudeChecks.cpp
source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.h 17 additions, 0 deletions

...API/libraries/core/checks/ConditionCheckMagnitudeChecks.h
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 17 additions, 8 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h 5 additions, 0 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h

with 141 additions and 14 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