Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

62f7b2da

Commit 62f7b2da authored 6 years ago by armarx-user

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/IMAGINERefactoring' into Ice3.7

parents 9e896b4f 1d185911

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp 7 additions, 5 deletions

...botUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp 36 additions, 3 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h 5 additions, 8 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 8 additions, 0 deletions

...braries/RobotStatechartHelpers/PositionControllerHelper.h
source/RobotAPI/libraries/core/PIDController.cpp 11 additions, 3 deletions

source/RobotAPI/libraries/core/PIDController.cpp
source/RobotAPI/libraries/core/PIDController.h 3 additions, 0 deletions

source/RobotAPI/libraries/core/PIDController.h

with 70 additions and 19 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