Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

bb6f86d7

Commit bb6f86d7 authored 4 years ago by Your Name

Downloads
- Plain Diff

Merge branch 'master' into ObjectPoseObserver

parents 12960ec5 071dbff6

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/units/RobotUnit/JointControllers/JointController.h 1 addition, 1 deletion

...onents/units/RobotUnit/JointControllers/JointController.h
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp 64 additions, 23 deletions

...botUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.h 14 additions, 1 deletion

...RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.h
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp 11 additions, 1 deletion

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h 42 additions, 0 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h

with 132 additions and 26 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