Qencoder fixes from Ryan Sundberg

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5354 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-14 19:26:13 +00:00
parent 0ea48ddabc
commit 53e3cbbfc7
4 changed files with 9 additions and 1 deletions

View File

@ -3622,4 +3622,7 @@
Makefile.unix. Makefile.unix.
* Makefile: This is a new top-level Makefile that just includes * Makefile: This is a new top-level Makefile that just includes
either Makefile.unix or Makefile.win 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)

View File

@ -607,6 +607,7 @@ static FAR struct stm32_lowerhalf_s *stm32_tim2lower(int tim)
#endif #endif
#ifdef CONFIG_STM32_TIM3_QE #ifdef CONFIG_STM32_TIM3_QE
case 3: case 3:
return &g_tim3lower;
#endif #endif
#ifdef CONFIG_STM32_TIM4_QE #ifdef CONFIG_STM32_TIM4_QE
case 4: case 4:

View File

@ -92,6 +92,10 @@ ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += up_stmpe811.c CSRCS += up_stmpe811.c
endif endif
ifeq ($(CONFIG_QENCODER),y)
CSRCS += up_qencoder.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)

View File

@ -233,7 +233,7 @@ mkdir -p $workingdir || { echo "Failed to created the new $workingdir"; exit 1;
# Create the rcS file from the rcS.template # Create the rcS file from the rcS.template
if [ ! -r $rcstemplate ]; then if [ ! -r $rcstemplate ]; then
echo "$rcstemplete does not exist" echo "$rcstemplate does not exist"
rmdir $workingdir rmdir $workingdir
exit 1 exit 1
fi fi