From bdf2a74f90f7ad5bbda8e78b755e06dc55f109c6 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 20 Mar 2006 15:40:34 +0000 Subject: [PATCH] Slave-Alias korrigiert. --- master/master.c | 4 ++-- mini/mini.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/master/master.c b/master/master.c index 69d6da30..1dbfb2be 100644 --- a/master/master.c +++ b/master/master.c @@ -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; diff --git a/mini/mini.c b/mini/mini.c index 26327510..c2f0a606 100644 --- a/mini/mini.c +++ b/mini/mini.c @@ -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}, {} };