Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

afb8cb98

Commit afb8cb98 authored 10 years ago by Simon Ottenhaus

Downloads
- Plain Diff

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

parents 52d0a968 af7090e3

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/applications/WeissHapticSensor/CMakeLists.txt 1 addition, 1 deletion

...ce/RobotAPI/applications/WeissHapticSensor/CMakeLists.txt
source/RobotAPI/applications/WeissHapticSensorsUnit/CMakeLists.txt 1 addition, 1 deletion

...botAPI/applications/WeissHapticSensorsUnit/CMakeLists.txt
source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.cpp 17 additions, 26 deletions

.../RobotAPI/drivers/WeissHapticSensor/AbstractInterface.cpp
source/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.h 2 additions, 1 deletion

...ce/RobotAPI/drivers/WeissHapticSensor/AbstractInterface.h
source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp 9 additions, 5 deletions

...ce/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp
source/RobotAPI/motioncontrol/MotionControl.cpp 149 additions, 10 deletions

source/RobotAPI/motioncontrol/MotionControl.cpp
source/RobotAPI/motioncontrol/MotionControl.h 46 additions, 3 deletions

source/RobotAPI/motioncontrol/MotionControl.h
source/RobotAPI/units/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/units/CMakeLists.txt

with 227 additions and 47 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