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

Slave-Alias korrigiert.

This commit is contained in:
Florian Pose 2006-03-20 15:40:34 +00:00
parent a0015bfb68
commit bdf2a74f90
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/master.c
View File

@ -607,7 +607,7 @@ ec_slave_t *ec_master_slave_address(const ec_master_t *master,
for (i = alias_slave_index + 1; i < master->slave_count; i++) {
slave = master->slaves + i;
if (!slave->type || slave->type->bus_coupler) break;
if (i - alias_slave_index - 1 == second) return slave;
if (i - alias_slave_index == second) return slave;
}
EC_ERR("Slave address \"%s\" - Bus coupler %i has no %lu. slave"
" following!\n", address,
@ -620,7 +620,7 @@ ec_slave_t *ec_master_slave_address(const ec_master_t *master,
slave_idx = 0;
for (i = 0; i < master->slave_count; i++, slave_idx++) {
slave = master->slaves + i;
if (!slave->type) continue; // FIXME
if (!slave->type) continue;
if (slave->type->bus_coupler) {
coupler_idx++;
slave_idx = 0;

4
mini/mini.c
View File

@ -43,9 +43,9 @@ ec_field_init_t domain1_fields[] = {
{r_4102, "4", "Beckhoff", "EL4102", "OutputValue", 0, 2},
{NULL, "5", "Beckhoff", "EL5001", "InputValue", 0},
{NULL, "6", "Beckhoff", "EL1014", "InputValue", 0},
{NULL, "7", "Beckhoff", "EL2004", "OutputValue", 0},
{NULL, "#0xBEEF:7", "Beckhoff", "EL2004", "OutputValue", 0},
{NULL, "8", "Beckhoff", "EL4132", "OutputValue", 0},
{NULL, "#48879:8", "Beckhoff", "EL4132", "OutputValue", 0},
{NULL, "#48879:9", "Beckhoff", "EL4132", "OutputValue", 0},
{}
};