equal
deleted
inserted
replaced
456 ec_master_queue_datagram(fsm->master, fsm->datagram); |
456 ec_master_queue_datagram(fsm->master, fsm->datagram); |
457 return; |
457 return; |
458 } |
458 } |
459 |
459 |
460 if (datagram->state != EC_DATAGRAM_RECEIVED) { |
460 if (datagram->state != EC_DATAGRAM_RECEIVED) { |
461 EC_ERR("Failed to receive AL state datagram for slave %i!\n", |
461 EC_ERR("Failed to receive AL state datagram for slave %i" |
462 slave->ring_position); |
462 " (datagram state %i)\n", slave->ring_position, datagram->state); |
463 fsm->state = ec_fsm_master_state_error; |
463 fsm->state = ec_fsm_master_state_error; |
464 return; |
464 return; |
465 } |
465 } |
466 |
466 |
467 // did the slave not respond to its station address? |
467 // did the slave not respond to its station address? |
662 ec_master_queue_datagram(fsm->master, fsm->datagram); |
662 ec_master_queue_datagram(fsm->master, fsm->datagram); |
663 return; |
663 return; |
664 } |
664 } |
665 |
665 |
666 if (datagram->state != EC_DATAGRAM_RECEIVED) { |
666 if (datagram->state != EC_DATAGRAM_RECEIVED) { |
667 EC_ERR("Failed to receive address datagram for slave %i.\n", |
667 EC_ERR("Failed to receive address datagram for slave %i" |
668 slave->ring_position); |
668 " (datagram state %i).\n", |
|
669 slave->ring_position, datagram->state); |
669 fsm->state = ec_fsm_master_state_error; |
670 fsm->state = ec_fsm_master_state_error; |
670 return; |
671 return; |
671 } |
672 } |
672 |
673 |
673 if (datagram->working_counter != 1) { |
674 if (datagram->working_counter != 1) { |