Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Control
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ed1d1489

Commit ed1d1489 authored 1 year ago by ARMAR-DE

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into feature/armar-de

parents 040834b1 68d7fdea

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/control/ethercat/Bus.cpp 31 additions, 7 deletions

source/armarx/control/ethercat/Bus.cpp
source/armarx/control/ethercat/CMakeLists.txt 1 addition, 0 deletions

source/armarx/control/ethercat/CMakeLists.txt
source/armarx/control/ethercat/RTUnit.cpp 11 additions, 8 deletions

source/armarx/control/ethercat/RTUnit.cpp
source/armarx/control/ethercat/RTUnit.h 3 additions, 0 deletions

source/armarx/control/ethercat/RTUnit.h
source/armarx/control/ethercat/bus_io/BusIO.cpp 49 additions, 22 deletions

source/armarx/control/ethercat/bus_io/BusIO.cpp
source/armarx/control/ethercat/bus_io/BusIO.h 5 additions, 3 deletions

source/armarx/control/ethercat/bus_io/BusIO.h
source/armarx/control/ethercat/bus_io/Timeouts.h 21 additions, 0 deletions

source/armarx/control/ethercat/bus_io/Timeouts.h

with 121 additions and 40 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