From 16fc839cfb79af992d55879914713e691044e820 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Tue, 4 Sep 2012 14:19:06 +0200 Subject: [PATCH 1/2] Malformed hg keywords. --- master/module.c | 2 +- master/slave_config.c | 2 +- master/sync.c | 2 +- master/sync.h | 2 +- tool/CommandDownload.cpp | 2 +- tool/DataTypeHandler.cpp | 2 +- tty/module.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/master/module.c b/master/module.c index 1830f5de..4423f3dc 100644 --- a/master/module.c +++ b/master/module.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: module.c,v 366de1369558 2011/07/25 08:29:48 fp $ + * $Id$ * * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/master/slave_config.c b/master/slave_config.c index 0a7baee8..57c93612 100644 --- a/master/slave_config.c +++ b/master/slave_config.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: slave_config.c,v 8c63d804ead9 2011/08/11 18:44:18 fp $ + * $Id$ * * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/master/sync.c b/master/sync.c index b0ac66d8..71b23971 100644 --- a/master/sync.c +++ b/master/sync.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: sync.c,v d9cf40facbc4 2010/05/03 16:07:57 fp $ + * $Id$ * * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/master/sync.h b/master/sync.h index 9e9ceef1..30f8f348 100644 --- a/master/sync.h +++ b/master/sync.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: sync.h,v a864688e7de5 2009/07/27 10:48:52 fp $ + * $Id$ * * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/tool/CommandDownload.cpp b/tool/CommandDownload.cpp index 6706a4e2..0ee59d32 100644 --- a/tool/CommandDownload.cpp +++ b/tool/CommandDownload.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * - * $Id: CommandDownload.cpp,v 4f682084c643 2010/10/25 08:12:26 fp $ + * $Id$ * * Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/tool/DataTypeHandler.cpp b/tool/DataTypeHandler.cpp index 136f3cf1..e119daaa 100644 --- a/tool/DataTypeHandler.cpp +++ b/tool/DataTypeHandler.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * - * $Id: DataTypeHandler.cpp,v 08f547145c91 2012/01/04 14:57:10 fp $ + * $Id$ * * Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH * diff --git a/tty/module.c b/tty/module.c index 78ad30c4..353b4a8b 100644 --- a/tty/module.c +++ b/tty/module.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: module.c,v 55854f070c4a 2011/01/05 07:36:53 ch1010277 $ + * $Id$ * * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH * From 5824f0c60e7284390c8d852c51bad44c33f2bb44 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 6 Aug 2012 14:18:05 +0200 Subject: [PATCH 2/2] Fixed AL status code lookup. --- master/fsm_change.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/master/fsm_change.c b/master/fsm_change.c index 035332e6..584a2027 100644 --- a/master/fsm_change.c +++ b/master/fsm_change.c @@ -428,14 +428,18 @@ void ec_fsm_change_state_code(ec_fsm_change_t *fsm } else { code = EC_READ_U16(datagram->data); for (al_msg = al_status_messages; al_msg->code != 0xffff; al_msg++) { - if (al_msg->code != code) continue; + if (al_msg->code != code) { + continue; + } + EC_SLAVE_ERR(fsm->slave, "AL status message 0x%04X: \"%s\".\n", al_msg->code, al_msg->message); break; } - if (!al_msg->code) + if (al_msg->code == 0xffff) { /* not found in our list. */ EC_SLAVE_ERR(fsm->slave, "Unknown AL status code 0x%04X.\n", code); + } } // acknowledge "old" slave state