bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added datagram state to "Failed to receive..." messages.

This commit is contained in:
Florian Pose 2007-02-22 13:39:19 +00:00
parent 42e45a67ed
commit 53c66dad4f
5 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
master/fsm_change.c
View File

@ -182,8 +182,9 @@ void ec_fsm_change_state_check(ec_fsm_change_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_change_state_error;
EC_ERR("Failed to receive state datagram from slave %i!\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive state datagram from slave %i"
" (datagram state %i)!\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -238,8 +239,9 @@ void ec_fsm_change_state_status(ec_fsm_change_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_change_state_error;
EC_ERR("Failed to receive state checking datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive state checking datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -374,8 +376,9 @@ void ec_fsm_change_state_code(ec_fsm_change_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_change_state_error;
EC_ERR("Failed to receive AL status code datagram from slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive AL status code datagram from slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -436,8 +439,9 @@ void ec_fsm_change_state_ack(ec_fsm_change_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_change_state_error;
EC_ERR("Failed to receive state ack datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive state ack datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -476,8 +480,9 @@ void ec_fsm_change_state_check_ack(ec_fsm_change_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_change_state_error;
EC_ERR("Failed to receive state ack check datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive state ack check datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}

68
master/fsm_coe.c
View File

@ -286,7 +286,8 @@ void ec_fsm_coe_dict_request(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE dictionary request datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -323,8 +324,9 @@ void ec_fsm_coe_dict_check(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -384,7 +386,8 @@ void ec_fsm_coe_dict_response(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE dictionary response datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -513,7 +516,8 @@ void ec_fsm_coe_dict_desc_request(ec_fsm_coe_t *fsm /**< finite state machine */
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE SDO description request datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -550,8 +554,9 @@ void ec_fsm_coe_dict_desc_check(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -609,7 +614,8 @@ void ec_fsm_coe_dict_desc_response(ec_fsm_coe_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE SDO description response datagram from"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -725,7 +731,8 @@ void ec_fsm_coe_dict_entry_request(ec_fsm_coe_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE SDO entry request datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -763,8 +770,9 @@ void ec_fsm_coe_dict_entry_check(ec_fsm_coe_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -823,7 +831,8 @@ void ec_fsm_coe_dict_entry_response(ec_fsm_coe_t *fsm
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE SDO description response datagram from"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1018,7 +1027,8 @@ void ec_fsm_coe_down_request(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE download request datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1055,8 +1065,9 @@ void ec_fsm_coe_down_check(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1113,7 +1124,8 @@ void ec_fsm_coe_down_response(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE download response datagram from"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1235,8 +1247,9 @@ void ec_fsm_coe_up_request(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE upload request for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE upload request for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1273,8 +1286,9 @@ void ec_fsm_coe_up_check(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1336,7 +1350,8 @@ void ec_fsm_coe_up_response(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE upload response datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1484,7 +1499,8 @@ void ec_fsm_coe_up_seg_request(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE upload segment request datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1521,8 +1537,9 @@ void ec_fsm_coe_up_seg_check(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive CoE mailbox check datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -1584,7 +1601,8 @@ void ec_fsm_coe_up_seg_response(ec_fsm_coe_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_coe_error;
EC_ERR("Failed to receive CoE upload segment response datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}

9
master/fsm_master.c
View File

@ -458,8 +458,8 @@ void ec_fsm_master_state_read_states(ec_fsm_master_t *fsm /**< master state mach
}
if (datagram->state != EC_DATAGRAM_RECEIVED) {
EC_ERR("Failed to receive AL state datagram for slave %i!\n",
slave->ring_position);
EC_ERR("Failed to receive AL state datagram for slave %i"
" (datagram state %i)\n", slave->ring_position, datagram->state);
fsm->state = ec_fsm_master_state_error;
return;
}
@ -664,8 +664,9 @@ void ec_fsm_master_state_rewrite_addresses(ec_fsm_master_t *fsm
}
if (datagram->state != EC_DATAGRAM_RECEIVED) {
EC_ERR("Failed to receive address datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive address datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
fsm->state = ec_fsm_master_state_error;
return;
}

20
master/fsm_sii.c
View File

@ -191,8 +191,9 @@ void ec_fsm_sii_read_check(ec_fsm_sii_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_sii_error;
EC_ERR("Failed to receive SII read datagram from slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive SII read datagram from slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -238,8 +239,9 @@ void ec_fsm_sii_read_fetch(ec_fsm_sii_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_sii_error;
EC_ERR("Failed to receive SII check/fetch datagram from slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive SII check/fetch datagram from slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -336,8 +338,9 @@ void ec_fsm_sii_write_check(ec_fsm_sii_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_sii_error;
EC_ERR("Failed to receive SII write datagram for slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive SII write datagram for slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -375,8 +378,9 @@ void ec_fsm_sii_write_check2(ec_fsm_sii_t *fsm /**< finite state machine */)
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_sii_error;
EC_ERR("Failed to receive SII write check datagram from slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive SII write check datagram from slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}

32
master/fsm_slave.c
View File

@ -215,8 +215,9 @@ void ec_fsm_slave_scan_state_address(ec_fsm_slave_t *fsm /**< slave state machin
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive station address datagram for slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive station address datagram for slave %i"
" (datagram state %i)\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -253,8 +254,9 @@ void ec_fsm_slave_scan_state_state(ec_fsm_slave_t *fsm /**< slave state machine
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive AL state datagram from slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive AL state datagram from slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}
@ -299,8 +301,9 @@ void ec_fsm_slave_scan_state_base(ec_fsm_slave_t *fsm /**< slave state machine *
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive base data datagram for slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive base data datagram for slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -348,8 +351,9 @@ void ec_fsm_slave_scan_state_datalink(ec_fsm_slave_t *fsm /**< slave state machi
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive DL status datagram from slave %i.\n",
slave->ring_position);
EC_ERR("Failed to receive DL status datagram from slave %i"
" (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -741,7 +745,8 @@ void ec_fsm_slave_conf_state_sync(ec_fsm_slave_t *fsm /**< slave state machine *
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive sync manager configuration datagram for"
" slave %i.\n", slave->ring_position);
" slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -856,8 +861,8 @@ void ec_fsm_slave_conf_state_sync2(ec_fsm_slave_t *fsm /**< slave state machine
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive process data sync manager configuration"
" datagram for slave %i.\n",
slave->ring_position);
" datagram for slave %i (datagram state %i).\n",
slave->ring_position, datagram->state);
return;
}
@ -921,8 +926,9 @@ void ec_fsm_slave_conf_state_fmmu(ec_fsm_slave_t *fsm /**< slave state machine *
if (datagram->state != EC_DATAGRAM_RECEIVED) {
fsm->state = ec_fsm_slave_state_error;
EC_ERR("Failed to receive FMMUs datagram for slave %i.\n",
fsm->slave->ring_position);
EC_ERR("Failed to receive FMMUs datagram for slave %i"
" (datagram state %i).\n",
fsm->slave->ring_position, datagram->state);
return;
}