Browse Source

Qencoder fixes from Ryan Sundberg

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5354 42af7a65-404d-4744-a932-0658087f49c3
sbg
patacongo 12 years ago
parent
commit
2afceac487
  1. 3
      apps/ChangeLog.txt
  2. 3
      nuttx/ChangeLog
  3. 1
      nuttx/arch/arm/src/stm32/stm32_qencoder.c
  4. 4
      nuttx/configs/stm3240g-eval/src/Makefile
  5. 2
      nuttx/tools/mkromfsimg.sh

3
apps/ChangeLog.txt

@ -414,4 +414,7 @@ @@ -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.

3
nuttx/ChangeLog

@ -3622,4 +3622,7 @@ @@ -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)

1
nuttx/arch/arm/src/stm32/stm32_qencoder.c

@ -607,6 +607,7 @@ static FAR struct stm32_lowerhalf_s *stm32_tim2lower(int tim) @@ -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:

4
nuttx/configs/stm3240g-eval/src/Makefile

@ -92,6 +92,10 @@ ifeq ($(CONFIG_INPUT_STMPE811),y) @@ -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)

2
nuttx/tools/mkromfsimg.sh

@ -233,7 +233,7 @@ mkdir -p $workingdir || { echo "Failed to created the new $workingdir"; exit 1; @@ -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

Loading…
Cancel
Save