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

Renamed EC_ACK to EC_SLAVE_STATE_ACK_ERR

This commit is contained in:
Florian Pose 2006-10-17 14:10:29 +00:00
parent d8bfe9569d
commit 9f751d8e72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
master/fsm.c
View File

@ -1040,7 +1040,7 @@ void ec_fsm_slavescan_state(ec_fsm_t *fsm /**< finite state machine */)
}
slave->current_state = EC_READ_U8(datagram->data);
if (slave->current_state & EC_ACK) {
if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
EC_WARN("Slave %i has state error bit set (0x%02X)!\n",
slave->ring_position, slave->current_state);
slave->current_state &= 0x0F;
@ -1881,7 +1881,7 @@ void ec_fsm_change_status(ec_fsm_t *fsm /**< finite state machine */)
return;
}
if (slave->current_state & 0x10) {
if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
// state change error
fsm->change_new = slave->current_state & 0x0F;
EC_ERR("Failed to set state 0x%02X - Slave %i refused state change"

4
master/slave.h
View File

@ -67,8 +67,8 @@ typedef enum
/**< SAVEOP (mailbox communication and input update) */
EC_SLAVE_STATE_OP = 0x08,
/**< OP (mailbox communication and input/output update) */
EC_ACK = 0x10
/**< Acknoledge bit (no state) */
EC_SLAVE_STATE_ACK_ERR = 0x10
/**< Acknoledge/Error bit (no actual state) */
}
ec_slave_state_t;