bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'calc-dc-after-attach' into 'stable-1.6' 

Attach slaves before calculating DCs

Closes #212

See merge request etherlab.org/ethercat!185
This commit is contained in:
Florian Pose 2026-03-13 15:17:53 +01:00
parent 607d0fd1af c76b02ae2e
commit 7a7d7f051b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
master/fsm_master.c
View File

@ -989,11 +989,12 @@ void ec_fsm_master_state_scan_slave(
master->scan_index = master->slave_count; master->scan_index = master->slave_count;
wake_up_interruptible(&master->scan_queue); wake_up_interruptible(&master->scan_queue);
ec_master_calc_dc(master);
// Attach slave configurations // Attach slave configurations
ec_master_attach_slave_configs(master); ec_master_attach_slave_configs(master);
// Calculate DC (needs attached slaves due to reference clock selection)
ec_master_calc_dc(master);
#ifdef EC_EOE #ifdef EC_EOE
// check if EoE processing has to be started // check if EoE processing has to be started
ec_master_eoe_start(master); ec_master_eoe_start(master);