From 2afceac48734c888931e4b824a62fcfd0e4f5ad8 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 14 Nov 2012 19:26:13 +0000
Subject: [PATCH] Qencoder fixes from Ryan Sundberg

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5354 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                        | 3 +++
 nuttx/ChangeLog                           | 3 +++
 nuttx/arch/arm/src/stm32/stm32_qencoder.c | 1 +
 nuttx/configs/stm3240g-eval/src/Makefile  | 4 ++++
 nuttx/tools/mkromfsimg.sh                 | 2 +-
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 99f0ebc532..9040a7ec8d 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -414,4 +414,7 @@
 	* apps/nshlib/nsh_dbgcmds.c:  Add hexdump command to dump the contents
 	  of a file (or character device) to the console  Contributed by Petteri
 	  Aimonen.
+	* apps/examples/modbus:  Fixes from Freddie Chopin
+	* apps/examples/modbus/Kconfig: Kconfig logic for FreeModBus contributed
+	  by Freddie Chopin.
 
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index ce2db55b5f..5fa67d3fe7 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3622,4 +3622,7 @@
 	  Makefile.unix.
 	* Makefile:  This is a new top-level Makefile that just includes
 	  either Makefile.unix or Makefile.win
+	* configs/stm3240g-eval/src:  Qencoder fixes from Ryan Sundberg.
+	* arch/arm/src/stm32/stm32_qencoder.c: TIM3 bug fix from Ryan Sundberg.
+	* tools/mkromfsimg.sh: Correct typo in an error message (Ryan Sundberg)
 
diff --git a/nuttx/arch/arm/src/stm32/stm32_qencoder.c b/nuttx/arch/arm/src/stm32/stm32_qencoder.c
index 8553296f93..d37614c03c 100644
--- a/nuttx/arch/arm/src/stm32/stm32_qencoder.c
+++ b/nuttx/arch/arm/src/stm32/stm32_qencoder.c
@@ -607,6 +607,7 @@ static FAR struct stm32_lowerhalf_s *stm32_tim2lower(int tim)
 #endif
 #ifdef CONFIG_STM32_TIM3_QE
     case 3:
+      return &g_tim3lower;
 #endif
 #ifdef CONFIG_STM32_TIM4_QE
     case 4:
diff --git a/nuttx/configs/stm3240g-eval/src/Makefile b/nuttx/configs/stm3240g-eval/src/Makefile
index 7174fb1bc9..40c3b8769b 100644
--- a/nuttx/configs/stm3240g-eval/src/Makefile
+++ b/nuttx/configs/stm3240g-eval/src/Makefile
@@ -92,6 +92,10 @@ ifeq ($(CONFIG_INPUT_STMPE811),y)
 CSRCS		+= up_stmpe811.c
 endif
 
+ifeq ($(CONFIG_QENCODER),y)
+CSRCS		+= up_qencoder.c
+endif
+
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/tools/mkromfsimg.sh b/nuttx/tools/mkromfsimg.sh
index b774119800..8811f19536 100755
--- a/nuttx/tools/mkromfsimg.sh
+++ b/nuttx/tools/mkromfsimg.sh
@@ -233,7 +233,7 @@ mkdir -p $workingdir || { echo "Failed to created the new $workingdir"; exit 1;
 # Create the rcS file from the rcS.template
 
 if [ ! -r $rcstemplate ]; then
-    echo "$rcstemplete does not exist"
+    echo "$rcstemplate does not exist"
     rmdir $workingdir
     exit 1
 fi