From 19113fedc70776b79412b1be42a68edb42cb47bd Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Tue, 9 Jan 2007 13:42:38 +0000
Subject: [PATCH] Display requested state in slave info.
---
master/slave.c | 4 +++-
script/lsec.pl | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/master/slave.c b/master/slave.c
index 1b9ec109..cca6e6af 100644
--- a/master/slave.c
+++ b/master/slave.c
@@ -632,7 +632,9 @@ size_t ec_slave_info(const ec_slave_t *slave, /**< EtherCAT slave */
off += sprintf(buffer + off, "State: ");
off += ec_state_string(slave->current_state, buffer + off);
- off += sprintf(buffer + off, "\nFlags: %s, %s\n",
+ off += sprintf(buffer + off, " (");
+ off += ec_state_string(slave->requested_state, buffer + off);
+ off += sprintf(buffer + off, ")\nFlags: %s, %s\n",
slave->online ? "online" : "OFFLINE",
slave->error_flag ? "ERROR" : "ok");
off += sprintf(buffer + off, "Ring position: %i\n",
diff --git a/script/lsec.pl b/script/lsec.pl
index 58ec4ac7..70fe87c8 100755
--- a/script/lsec.pl
+++ b/script/lsec.pl
@@ -100,7 +100,7 @@ sub query_slaves
elsif ($line =~ /^Advanced position: (\d+:\d+)$/) {
$slave->{'advanced_position'} = $1;
}
- elsif ($line =~ /^State: (.+)$/) {
+ elsif ($line =~ /^State: (.+) /) {
$slave->{'state'} = $1;
}
elsif ($line =~ /^Coupler: ([a-z]+)$/) {
--
GitLab