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

Bugfix: Reset config_changed flag when aborting state check. 

--HG--
branch : stable-1.5
parent 3ab2926c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
master/fsm_master.c
+ 4
− 0
View file @ e5f4b9a3
...@@ -567,6 +567,8 @@ void ec_fsm_master_action_configure( ...@@ -567,6 +567,8 @@ void ec_fsm_master_action_configure(
ec_slave_t *slave = fsm->slave; ec_slave_t *slave = fsm->slave;
if (master->config_changed) { if (master->config_changed) {
master->config_changed = 0;
// abort iterating through slaves, // abort iterating through slaves,
// first compensate DC system time offsets, // first compensate DC system time offsets,
// then begin configuring at slave 0 // then begin configuring at slave 0
...@@ -819,6 +821,8 @@ void ec_fsm_master_state_scan_slave( ...@@ -819,6 +821,8 @@ void ec_fsm_master_state_scan_slave(
#endif #endif
if (master->slave_count) { if (master->slave_count) {
master->config_changed = 0;
fsm->slave = master->slaves; // begin with first slave fsm->slave = master->slaves; // begin with first slave
ec_fsm_master_enter_write_system_times(fsm); ec_fsm_master_enter_write_system_times(fsm);
} else { } else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment