From 0260f9a080bee447e8b9917010459ba34b9fdd94 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 20 Oct 2006 12:50:28 +0000 Subject: [PATCH] Fixed bug in master state machine. --- master/fsm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/master/fsm.c b/master/fsm.c index ed3aea43..2b18b11f 100644 --- a/master/fsm.c +++ b/master/fsm.c @@ -929,7 +929,6 @@ void ec_fsm_master_scan_slaves(ec_fsm_t *fsm /**< finite state machine */) ec_master_t *master = fsm->master; ec_slave_t *slave = fsm->slave; - fsm->slave_state(fsm); // execute slave state machine if (fsm->slave_state != ec_fsm_end @@ -1042,8 +1041,8 @@ void ec_fsm_master_sdodict(ec_fsm_t *fsm /**< finite state machine */) fsm->coe_state(fsm); // execute CoE state machine if (fsm->coe_state == ec_fsm_error) { - fsm->slave->error_flag = 1; - fsm->slave_state = ec_fsm_error; + fsm->master_state = ec_fsm_master_start; + fsm->master_state(fsm); // execute immediately return; }