diff --git a/master/fsm.c b/master/fsm.c index 423e36c55e815c87e90a2ef27bc55632c3571d6b..9d8e5c984ffd59fbca114d76ef61eaf3ee74c21e 100644 --- a/master/fsm.c +++ b/master/fsm.c @@ -325,20 +325,13 @@ void ec_fsm_master_action_process_states(ec_fsm_t *fsm if (slave->error_flag || !slave->online || slave->requested_state == EC_SLAVE_STATE_UNKNOWN - || (slave->current_state == slave->requested_state - && slave->configured)) continue; + || slave->current_state == slave->requested_state) continue; if (master->debug_level) { ec_state_string(slave->current_state, old_state); - if (slave->current_state != slave->requested_state) { - ec_state_string(slave->requested_state, new_state); - EC_DBG("Changing state of slave %i (%s -> %s).\n", - slave->ring_position, old_state, new_state); - } - else if (!slave->configured) { - EC_DBG("Reconfiguring slave %i (%s).\n", - slave->ring_position, old_state); - } + ec_state_string(slave->requested_state, new_state); + EC_DBG("Changing state of slave %i (%s -> %s).\n", + slave->ring_position, old_state, new_state); } fsm->master_state = ec_fsm_master_configure_slave; @@ -1315,8 +1308,6 @@ void ec_fsm_slaveconf_state_init(ec_fsm_t *fsm /**< finite state machine */) return; } - slave->configured = 1; - if (master->debug_level) { EC_DBG("Slave %i is now in INIT.\n", slave->ring_position); } diff --git a/master/slave.c b/master/slave.c index cca6e6af81999d671f19f6fe066910dd4d06d4c5..d23cdebf9ec3712b06ab4c0c5c15cac9efa22d11 100644 --- a/master/slave.c +++ b/master/slave.c @@ -112,7 +112,6 @@ int ec_slave_init(ec_slave_t *slave, /**< EtherCAT slave */ slave->requested_state = EC_SLAVE_STATE_UNKNOWN; slave->current_state = EC_SLAVE_STATE_UNKNOWN; - slave->configured = 0; slave->error_flag = 0; slave->online = 1; slave->fmmu_count = 0; diff --git a/master/slave.h b/master/slave.h index d61015e7596fb2269ef25dd7f6d95aec40fea5d0..aabdd0d592bd39c7d3c7bead333dcd4e1d0655b5 100644 --- a/master/slave.h +++ b/master/slave.h @@ -197,7 +197,6 @@ struct ec_slave ec_slave_state_t requested_state; /**< requested slave state */ ec_slave_state_t current_state; /**< current slave state */ - unsigned int configured; /**< the slave was configured by this master */ unsigned int error_flag; /**< stop processing after an error */ unsigned int online; /**< non-zero, if the slave responds. */