Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

a6819088

Commit a6819088 authored 10 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 6663aa5b d77869e3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/WeissHapticSensorsUnitTest/jquery.sparkline.js 3054 additions, 0 deletions

scenarios/WeissHapticSensorsUnitTest/jquery.sparkline.js
scenarios/WeissHapticSensorsUnitTest/tactile.html 145 additions, 10 deletions

scenarios/WeissHapticSensorsUnitTest/tactile.html
source/RobotAPI/drivers/Types.h 0 additions, 49 deletions

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

.../RobotAPI/drivers/WeissHapticSensor/AbstractInterface.cpp
source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp 23 additions, 1 deletion

...ce/RobotAPI/drivers/WeissHapticSensor/SerialInterface.cpp
source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.h 2 additions, 0 deletions

source/RobotAPI/drivers/WeissHapticSensor/SerialInterface.h
source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp 11 additions, 0 deletions

.../RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp

with 3246 additions and 61 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