Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
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
RobotAPI
Commits
4e8c03c0
Commit
4e8c03c0
authored
6 years ago
by
Mirko Wächter
Browse files
Options
Downloads
Patches
Plain Diff
more startup output
parent
1aabce8c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
+3
-1
3 additions, 1 deletion
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
with
3 additions
and
1 deletion
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
+
3
−
1
View file @
4e8c03c0
...
...
@@ -183,6 +183,7 @@ bool EtherCAT::startBus(bool createDevices)
{
slave
->
prepareForSafeOp
();
}
ARMARX_INFO
<<
"Finishing Preparing for safe op now"
;
for
(
auto
slave
:
slaves
)
{
slave
->
finishPreparingForSafeOp
();
...
...
@@ -190,10 +191,11 @@ bool EtherCAT::startBus(bool createDevices)
osal_usleep
(
500000
);
///// going to SAFE_OP
//do the mapping
ARMARX_INFO
<<
"Mapping...."
;
actualMappedSize
=
ec_config_map
(
IOmap
.
data
());
ARMARX_INFO
<<
"Going to safe op now"
;
//wait to get all slaves to SAFE-OP
ec_statecheck
(
0
,
EC_STATE_SAFE_OP
,
EC_TIMEOUTSTATE
*
4
);
ARMARX_INFO
<<
"IOmapping done, size: "
<<
actualMappedSize
<<
" - all Slaves are in SAFE-OP now
\n
"
;
...
...
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