Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

04599658

Commit 04599658 authored 6 years ago by armar6demo

Downloads
- Plain Diff

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

parents 7cc2b871 277ef79f

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

etc/doxygen/pages/GuiPlugins.dox 2 additions, 0 deletions

etc/doxygen/pages/GuiPlugins.dox
source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp 4 additions, 3 deletions

...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
source/RobotAPI/drivers/CyberGloveUnit/serial.tgz 0 additions, 0 deletions

source/RobotAPI/drivers/CyberGloveUnit/serial.tgz
source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidget.ui 75 additions, 3 deletions

.../gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidget.ui
source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp 189 additions, 19 deletions

...s/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h 35 additions, 26 deletions

...ins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 0 additions, 5 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 2 additions, 3 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 71 additions, 136 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 13 additions, 13 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 391 additions and 208 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