Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

a1892351

Commit a1892351 authored 11 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'ForceControl'

parents e3818e0a f9d7ad5e

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/core/RobotStatechartContext.h 3 additions, 1 deletion

source/RobotAPI/core/RobotStatechartContext.h
source/RobotAPI/motioncontrol/CMakeLists.txt 5 additions, 3 deletions

source/RobotAPI/motioncontrol/CMakeLists.txt
source/RobotAPI/motioncontrol/MotionControl.cpp 3 additions, 0 deletions

source/RobotAPI/motioncontrol/MotionControl.cpp
source/RobotAPI/motioncontrol/ZeroForceControl.cpp 154 additions, 0 deletions

source/RobotAPI/motioncontrol/ZeroForceControl.cpp
source/RobotAPI/motioncontrol/ZeroForceControl.h 60 additions, 0 deletions

source/RobotAPI/motioncontrol/ZeroForceControl.h
source/RobotAPI/units/ForceTorqueObserver.cpp 9 additions, 1 deletion

source/RobotAPI/units/ForceTorqueObserver.cpp
source/RobotAPI/units/ForceTorqueObserver.h 3 additions, 0 deletions

source/RobotAPI/units/ForceTorqueObserver.h
source/RobotAPI/units/TCPControlUnit.cpp 542 additions, 33 deletions

source/RobotAPI/units/TCPControlUnit.cpp
source/RobotAPI/units/TCPControlUnit.h 23 additions, 2 deletions

source/RobotAPI/units/TCPControlUnit.h

with 802 additions and 40 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