Skip to content
Snippets Groups Projects
Commit 487ea5be authored by Florian Pose's avatar Florian Pose
Browse files

Always set DC reference clock to OP.

parent 14a66816
No related branches found
No related tags found
No related merge requests found
...@@ -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.
......
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment