From 38daafb6ac22ba66cbc6c9bf6ceec9d0611dfb1f Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 14 Nov 2012 14:29:01 +0000
Subject: [PATCH] ModBus fixes from Freddie Chopin

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5351 42af7a65-404d-4744-a932-0658087f49c3
---
 examples/Make.defs | 4 ++++
 modbus/mb.c        | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/Make.defs b/examples/Make.defs
index 1c6151384..3d95ccb16 100644
--- a/examples/Make.defs
+++ b/examples/Make.defs
@@ -106,6 +106,10 @@ ifeq ($(CONFIG_EXAMPLES_MM),y)
 CONFIGURED_APPS += examples/mm
 endif
 
+ifeq ($(CONFIG_EXAMPLES_MODBUS),y)
+CONFIGURED_APPS += examples/modbus
+endif
+
 ifeq ($(CONFIG_EXAMPLES_MOUNT),y)
 CONFIGURED_APPS += examples/mount
 endif
diff --git a/modbus/mb.c b/modbus/mb.c
index 209b1274c..8417d1274 100644
--- a/modbus/mb.c
+++ b/modbus/mb.c
@@ -399,10 +399,12 @@ eMBPoll( void )
                     ucMBFrame[usLength++] = ( uint8_t )( ucFunctionCode | MB_FUNC_ERROR );
                     ucMBFrame[usLength++] = eException;
                 }
+#ifdef CONFIG_MB_ASCII_ENABLED
                 if( ( eMBCurrentMode == MB_ASCII ) && CONFIG_MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS )
                 {
                     vMBPortTimersDelay( CONFIG_MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS );
-                }                
+                }
+#endif
                 eStatus = peMBFrameSendCur( ucMBAddress, ucMBFrame, usLength );
             }
             break;