Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

3af90df8

Commit 3af90df8 authored 5 years ago by SecondHands Demo

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/armar6demo' into SecondHandsDemo

parents 145cdd6e 56ac5f75

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/GamepadControlUnit/GamepadControlUnit.cpp 8 additions, 1 deletion

...tAPI/components/GamepadControlUnit/GamepadControlUnit.cpp
source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp 43 additions, 11 deletions

source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
source/RobotAPI/drivers/GamepadUnit/GamepadUnit.h 10 additions, 0 deletions

source/RobotAPI/drivers/GamepadUnit/GamepadUnit.h
source/RobotAPI/drivers/GamepadUnit/Joystick.h 6 additions, 0 deletions

source/RobotAPI/drivers/GamepadUnit/Joystick.h
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 1 deletion

source/RobotAPI/libraries/CMakeLists.txt

with 69 additions and 13 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