Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Skills
Control
Commits
db12798c
Commit
db12798c
authored
1 year ago
by
Christian Dreher
Committed by
ARMAR-DE
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
feat: Move configurable EtherCAT timeouts to RTUnit
parent
68d7fdea
Branches
feat/introduce-configurable-timeouts-in-ecat
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!48
Move configurable EtherCAT timeouts to RTUnit
,
!47
Changes for ARMAR-DE and ARMAR-7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/armarx/control/ethercat/RTUnit.cpp
+14
-0
14 additions, 0 deletions
source/armarx/control/ethercat/RTUnit.cpp
source/armarx/control/ethercat/RTUnit.h
+5
-0
5 additions, 0 deletions
source/armarx/control/ethercat/RTUnit.h
with
19 additions
and
0 deletions
source/armarx/control/ethercat/RTUnit.cpp
+
14
−
0
View file @
db12798c
...
...
@@ -107,6 +107,7 @@ namespace armarx::control::ethercat
Bus
&
bus
=
Bus
::
getBus
();
bus
.
setRobot
(
robot
);
bus
.
setLocalMinimumLoggingLevel
(
this
->
getEffectiveLoggingLevel
());
bus
.
setTimeouts
(
ethercatTimeouts
);
// Set configured timeouts.
}
void
...
...
@@ -267,6 +268,19 @@ namespace armarx::control::ethercat
def
->
optional
(
properties
.
robotJointsNodeSet
,
"nodeSet.robotJoints"
,
"The node set which contains the actuated joints."
);
def
->
optional
(
properties
.
robotColNodeSet
,
"nodeSet.robotCol"
,
"The node set for e.g. gravity computation."
);
def
->
optional
(
ethercatTimeouts
.
registerRead_us
,
"ethercat.timeouts.register_read"
,
"EtherCAT timeout for a register frame to read certain registers in µs."
);
def
->
optional
(
ethercatTimeouts
.
stateCheck_us
,
"ethercat.timeouts.state_check"
,
"EtherCAT timeout to check for the current EtherCAT state of slaves in µs."
);
def
->
optional
(
ethercatTimeouts
.
sdoRead_us
,
"ethercat.timeouts.sdo_read"
,
"EtherCAT timeout to read an SDO in µs."
);
def
->
optional
(
ethercatTimeouts
.
sdoWrite_us
,
"ethercat.timeouts.sdo_write"
,
"EtherCAT timeout to write an SDO in µs."
);
return
def
;
}
...
...
This diff is collapsed.
Click to expand it.
source/armarx/control/ethercat/RTUnit.h
+
5
−
0
View file @
db12798c
...
...
@@ -35,6 +35,8 @@
#include
<ArmarXCore/core/rapidxml/wrapper/RapidXmlReader.h>
#include
<ArmarXCore/core/services/tasks/PeriodicTask.h>
#include
<armarx/control/ethercat/bus_io/Timeouts.h>
#include
<RobotAPI/components/units/RobotUnit/RobotUnit.h>
/**
...
...
@@ -209,6 +211,9 @@ namespace armarx::control::ethercat
std
::
string
robotJointsNodeSet
=
"RobotJoints"
;
std
::
string
robotColNodeSet
=
"RobotCol"
;
}
properties
;
armarx
::
control
::
ethercat
::
Timeouts
ethercatTimeouts
;
};
}
// namespace armarx::control::ethercat
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment