equal
deleted
inserted
replaced
565 { |
565 { |
566 ec_master_t *master = fsm->master; |
566 ec_master_t *master = fsm->master; |
567 ec_slave_t *slave = fsm->slave; |
567 ec_slave_t *slave = fsm->slave; |
568 |
568 |
569 if (master->config_changed) { |
569 if (master->config_changed) { |
|
570 master->config_changed = 0; |
|
571 |
570 // abort iterating through slaves, |
572 // abort iterating through slaves, |
571 // first compensate DC system time offsets, |
573 // first compensate DC system time offsets, |
572 // then begin configuring at slave 0 |
574 // then begin configuring at slave 0 |
573 EC_MASTER_DBG(master, 1, "Configuration changed" |
575 EC_MASTER_DBG(master, 1, "Configuration changed" |
574 " (aborting state check).\n"); |
576 " (aborting state check).\n"); |
817 // check if EoE processing has to be started |
819 // check if EoE processing has to be started |
818 ec_master_eoe_start(master); |
820 ec_master_eoe_start(master); |
819 #endif |
821 #endif |
820 |
822 |
821 if (master->slave_count) { |
823 if (master->slave_count) { |
|
824 master->config_changed = 0; |
|
825 |
822 fsm->slave = master->slaves; // begin with first slave |
826 fsm->slave = master->slaves; // begin with first slave |
823 ec_fsm_master_enter_write_system_times(fsm); |
827 ec_fsm_master_enter_write_system_times(fsm); |
824 } else { |
828 } else { |
825 ec_fsm_master_restart(fsm); |
829 ec_fsm_master_restart(fsm); |
826 } |
830 } |