Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

2edddd9a

Commit 2edddd9a authored 5 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 649402f7 876732a2

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp 1 addition, 1 deletion

...botUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp 41 additions, 27 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h 3 additions, 0 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h

with 45 additions and 28 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