# HG changeset patch # User Florian Pose # Date 1142869234 0 # Node ID 231b22fc034b34604cd5b5f187c1d677c1d23631 # Parent 509afb04ded0ed37816fefaf7278a15de399b5a0 Slave-Alias korrigiert. diff -r 509afb04ded0 -r 231b22fc034b master/master.c --- a/master/master.c Mon Mar 20 15:29:01 2006 +0000 +++ b/master/master.c Mon Mar 20 15:40:34 2006 +0000 @@ -607,7 +607,7 @@ 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 @@ 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; diff -r 509afb04ded0 -r 231b22fc034b mini/mini.c --- a/mini/mini.c Mon Mar 20 15:29:01 2006 +0000 +++ b/mini/mini.c Mon Mar 20 15:40:34 2006 +0000 @@ -43,9 +43,9 @@ {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}, {} };