Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
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
Code review analytics
Issue 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
ICS Control System Infrastructure
etherlabmaster
Commits
ea4b27c6
Commit
ea4b27c6
authored
15 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Do not output CoE retries.
parent
08411cda
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
master/fsm_coe.c
+6
-0
6 additions, 0 deletions
master/fsm_coe.c
with
6 additions
and
0 deletions
master/fsm_coe.c
+
6
−
0
View file @
ea4b27c6
...
@@ -49,6 +49,8 @@
...
@@ -49,6 +49,8 @@
#define EC_COE_DOWN_SEG_REQ_HEADER_SIZE 3
#define EC_COE_DOWN_SEG_REQ_HEADER_SIZE 3
#define EC_COE_DOWN_SEG_MIN_DATA_SIZE 7
#define EC_COE_DOWN_SEG_MIN_DATA_SIZE 7
#define DEBUG_RETRIES 0
/*****************************************************************************/
/*****************************************************************************/
void
ec_fsm_coe_dict_start
(
ec_fsm_coe_t
*
);
void
ec_fsm_coe_dict_start
(
ec_fsm_coe_t
*
);
...
@@ -1213,11 +1215,13 @@ void ec_fsm_coe_down_request(ec_fsm_coe_t *fsm /**< finite state machine */)
...
@@ -1213,11 +1215,13 @@ void ec_fsm_coe_down_request(ec_fsm_coe_t *fsm /**< finite state machine */)
unsigned
long
diff_ms
=
unsigned
long
diff_ms
=
(
jiffies
-
fsm
->
request
->
jiffies_sent
)
*
1000
/
HZ
;
(
jiffies
-
fsm
->
request
->
jiffies_sent
)
*
1000
/
HZ
;
if
(
diff_ms
<
fsm
->
request
->
response_timeout
)
{
if
(
diff_ms
<
fsm
->
request
->
response_timeout
)
{
#if DEBUG_RETRIES
if
(
fsm
->
slave
->
master
->
debug_level
)
{
if
(
fsm
->
slave
->
master
->
debug_level
)
{
EC_DBG
(
"Slave %u did not respond to SDO download request. "
EC_DBG
(
"Slave %u did not respond to SDO download request. "
"Retrying after %u ms...
\n
"
,
"Retrying after %u ms...
\n
"
,
slave
->
ring_position
,
(
u32
)
diff_ms
);
slave
->
ring_position
,
(
u32
)
diff_ms
);
}
}
#endif
// no response; send request datagram again
// no response; send request datagram again
return
;
return
;
}
}
...
@@ -1706,11 +1710,13 @@ void ec_fsm_coe_up_request(ec_fsm_coe_t *fsm /**< finite state machine */)
...
@@ -1706,11 +1710,13 @@ void ec_fsm_coe_up_request(ec_fsm_coe_t *fsm /**< finite state machine */)
unsigned
long
diff_ms
=
unsigned
long
diff_ms
=
(
jiffies
-
fsm
->
request
->
jiffies_sent
)
*
1000
/
HZ
;
(
jiffies
-
fsm
->
request
->
jiffies_sent
)
*
1000
/
HZ
;
if
(
diff_ms
<
fsm
->
request
->
response_timeout
)
{
if
(
diff_ms
<
fsm
->
request
->
response_timeout
)
{
#if DEBUG_RETRIES
if
(
fsm
->
slave
->
master
->
debug_level
)
{
if
(
fsm
->
slave
->
master
->
debug_level
)
{
EC_DBG
(
"Slave %u did not respond to SDO upload request. "
EC_DBG
(
"Slave %u did not respond to SDO upload request. "
"Retrying after %u ms...
\n
"
,
"Retrying after %u ms...
\n
"
,
slave
->
ring_position
,
(
u32
)
diff_ms
);
slave
->
ring_position
,
(
u32
)
diff_ms
);
}
}
#endif
// no response; send request datagram again
// no response; send request datagram again
return
;
return
;
}
}
...
...
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