diff --git a/master/ethernet.c b/master/ethernet.c index a7a46746..dd9565b1 100644 --- a/master/ethernet.c +++ b/master/ethernet.c @@ -324,7 +324,7 @@ void ec_eoe_run(ec_eoe_t *eoe /**< EoE handler */) // if the datagram was not sent, or is not yet received, skip this cycle if (eoe->queue_datagram || - eoe->datagram.state == EC_DATAGRAM_SENT || eoe->datagram.state == EC_DATAGRAM_QUEUED) + eoe->datagram.state == EC_DATAGRAM_QUEUED || eoe->datagram.state == EC_DATAGRAM_SENT) return; // call state function diff --git a/master/fsm_master.c b/master/fsm_master.c index 3ccc4c86..12d56a7b 100644 --- a/master/fsm_master.c +++ b/master/fsm_master.c @@ -133,8 +133,8 @@ int ec_fsm_master_exec( ec_fsm_master_t *fsm /**< Master state machine. */ ) { - if (fsm->datagram->state == EC_DATAGRAM_SENT - || fsm->datagram->state == EC_DATAGRAM_QUEUED) { + if (fsm->datagram->state == EC_DATAGRAM_QUEUED + || fsm->datagram->state == EC_DATAGRAM_SENT) { // datagram was not sent or received yet. return 0; } diff --git a/master/fsm_slave.c b/master/fsm_slave.c index e1700c73..3d7be157 100644 --- a/master/fsm_slave.c +++ b/master/fsm_slave.c @@ -101,8 +101,8 @@ int ec_fsm_slave_exec( ec_fsm_slave_t *fsm /**< Slave state machine. */ ) { - if (fsm->datagram->state == EC_DATAGRAM_SENT - || fsm->datagram->state == EC_DATAGRAM_QUEUED) { + if (fsm->datagram->state == EC_DATAGRAM_QUEUED + || fsm->datagram->state == EC_DATAGRAM_SENT) { // datagram was not sent or received yet. return 0; } diff --git a/master/fsm_slave_config.c b/master/fsm_slave_config.c index 6140ffa9..cbcc7359 100644 --- a/master/fsm_slave_config.c +++ b/master/fsm_slave_config.c @@ -177,8 +177,8 @@ int ec_fsm_slave_config_exec( ec_fsm_slave_config_t *fsm /**< slave state machine */ ) { - if (fsm->datagram->state == EC_DATAGRAM_SENT - || fsm->datagram->state == EC_DATAGRAM_QUEUED) { + if (fsm->datagram->state == EC_DATAGRAM_QUEUED + || fsm->datagram->state == EC_DATAGRAM_SENT) { // datagram was not sent or received yet. return ec_fsm_slave_config_running(fsm); } diff --git a/master/fsm_slave_scan.c b/master/fsm_slave_scan.c index 18b4e371..306fc3fc 100644 --- a/master/fsm_slave_scan.c +++ b/master/fsm_slave_scan.c @@ -137,8 +137,8 @@ int ec_fsm_slave_scan_running(const ec_fsm_slave_scan_t *fsm /**< slave state ma int ec_fsm_slave_scan_exec(ec_fsm_slave_scan_t *fsm /**< slave state machine */) { - if (fsm->datagram->state == EC_DATAGRAM_SENT - || fsm->datagram->state == EC_DATAGRAM_QUEUED) { + if (fsm->datagram->state == EC_DATAGRAM_QUEUED + || fsm->datagram->state == EC_DATAGRAM_SENT) { // datagram was not sent or received yet. return ec_fsm_slave_scan_running(fsm); }