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
487ea5be
Commit
487ea5be
authored
15 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Always set DC reference clock to OP.
parent
14a66816
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
TODO
+0
-1
0 additions, 1 deletion
TODO
master/master.c
+6
-0
6 additions, 0 deletions
master/master.c
with
6 additions
and
1 deletion
TODO
+
0
−
1
View file @
487ea5be
...
@@ -14,7 +14,6 @@ Version 1.5.0:
...
@@ -14,7 +14,6 @@ Version 1.5.0:
- Check 32/64 bit operations.
- Check 32/64 bit operations.
- Use vendor correction factors when calculating transmission delays.
- Use vendor correction factors when calculating transmission delays.
- Skip setting system time offset when application detached.
- Skip setting system time offset when application detached.
- Always set reference clock to OP.
- Output DC configuration in 'ethercat config'.
- Output DC configuration in 'ethercat config'.
- How to set the SYNC1 shift time?
- How to set the SYNC1 shift time?
- Do not output graph, if topology calculation failed.
- Do not output graph, if topology calculation failed.
...
...
This diff is collapsed.
Click to expand it.
master/master.c
+
6
−
0
View file @
487ea5be
...
@@ -555,6 +555,7 @@ int ec_master_enter_operation_phase(ec_master_t *master /**< EtherCAT master */)
...
@@ -555,6 +555,7 @@ int ec_master_enter_operation_phase(ec_master_t *master /**< EtherCAT master */)
slave
++
)
{
slave
++
)
{
ec_slave_request_state
(
slave
,
EC_SLAVE_STATE_PREOP
);
ec_slave_request_state
(
slave
,
EC_SLAVE_STATE_PREOP
);
}
}
#ifdef EC_EOE
#ifdef EC_EOE
// ... but set EoE slaves to OP
// ... but set EoE slaves to OP
list_for_each_entry
(
eoe
,
&
master
->
eoe_handlers
,
list
)
{
list_for_each_entry
(
eoe
,
&
master
->
eoe_handlers
,
list
)
{
...
@@ -1548,6 +1549,11 @@ int ecrt_master_activate(ec_master_t *master)
...
@@ -1548,6 +1549,11 @@ int ecrt_master_activate(ec_master_t *master)
domain_offset
+=
domain
->
data_size
;
domain_offset
+=
domain
->
data_size
;
}
}
// always set DC reference clock to OP
if
(
master
->
dc_ref_clock
)
{
ec_slave_request_state
(
master
->
dc_ref_clock
,
EC_SLAVE_STATE_OP
);
}
up
(
&
master
->
master_sem
);
up
(
&
master
->
master_sem
);
// restart EoE process and master thread with new locking
// restart EoE process and master thread with new locking
...
...
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