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

merge -c1582 branches/stable-1.4: Typo.

This commit is contained in:
Florian Pose 2008-11-06 15:46:40 +00:00
parent b6db36db8b
commit f552f81763
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -22,6 +22,7 @@ Changes since 1.4.0-rc3:
* Fixed race condition concerning the ec_slave_config_state->operational flag.
* Fixed wrong calculation of the expected working counter if the process data
of a domain span several datagrams.
* Fixed typo in logging output.
Changes in 1.4.0-rc3:

2
master/fsm_coe.c
View File

@ -1404,7 +1404,7 @@ void ec_fsm_coe_up_request(ec_fsm_coe_t *fsm /**< finite state machine */)
(jiffies - fsm->request->jiffies_sent) * 1000 / HZ;
if (diff_ms < fsm->request->response_timeout) {
if (fsm->slave->master->debug_level) {
EC_DBG("Slave %u did no respond to Sdo upload request. "
EC_DBG("Slave %u did not respond to Sdo upload request. "
"Retrying after %u ms...\n",
slave->ring_position, (u32) diff_ms);
}