sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some errors in STM32F7 ADC and I2C. Also some errors in STM32-WS configuration

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-17 08:36:23 -06:00
parent 2f24f911f5
commit fb1d830770
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/stm32f7/stm32_adc.h
View File

@ -103,19 +103,19 @@
/* Up to 3 ADC interfaces are supported */ /* Up to 3 ADC interfaces are supported */
#if STM32_NADC < 4 #if STM32F7_NADC < 4
# undef CONFIG_STM32F7_ADC4 # undef CONFIG_STM32F7_ADC4
#endif #endif
#if STM32_NADC < 3 #if STM32F7_NADC < 3
# undef CONFIG_STM32F7_ADC3 # undef CONFIG_STM32F7_ADC3
#endif #endif
#if STM32_NADC < 2 #if STM32F7_NADC < 2
# undef CONFIG_STM32F7_ADC2 # undef CONFIG_STM32F7_ADC2
#endif #endif
#if STM32_NADC < 1 #if STM32F7_NADC < 1
# undef CONFIG_STM32F7_ADC1 # undef CONFIG_STM32F7_ADC1
#endif #endif

4
arch/arm/src/stm32f7/stm32_i2c.c
View File

@ -2221,8 +2221,8 @@ static int stm32_i2c_process(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
struct stm32_i2c_inst_s *inst = (struct stm32_i2c_inst_s *)dev; struct stm32_i2c_inst_s *inst = (struct stm32_i2c_inst_s *)dev;
FAR struct stm32_i2c_priv_s *priv = inst->priv; FAR struct stm32_i2c_priv_s *priv = inst->priv;
uint32_t status = 0; uint32_t status = 0;
uint32_t cr1 = 0; uint32_t cr1;
uint32_t cr2 = 0; uint32_t cr2;
int errval = 0; int errval = 0;
int waitrc = 0; int waitrc = 0;

3
configs/Kconfig
View File

@ -1009,9 +1009,6 @@ config ARCH_BOARD_STM32F746G_DISCO
config ARCH_BOARD_STM32F746_WS config ARCH_BOARD_STM32F746_WS
bool "Waveshare STM32F746 board" bool "Waveshare STM32F746 board"
depends on ARCH_CHIP_STM32F746IG depends on ARCH_CHIP_STM32F746IG
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
---help--- ---help---
Waveshare STM32F746 development board featuring the STM32F746IG MCU. Waveshare STM32F746 development board featuring the STM32F746IG MCU.

6
configs/stm32f746-ws/nsh/defconfig
View File

@ -415,11 +415,6 @@ CONFIG_ARCH_BOARD="stm32f746-ws"
# #
# Common Board Options # Common Board Options
# #
CONFIG_ARCH_HAVE_LEDS=y
CONFIG_ARCH_LEDS=y
CONFIG_ARCH_HAVE_BUTTONS=y
# CONFIG_ARCH_BUTTONS is not set
CONFIG_ARCH_HAVE_IRQBUTTONS=y
CONFIG_NSH_MMCSDMINOR=0 CONFIG_NSH_MMCSDMINOR=0
# #
@ -614,7 +609,6 @@ CONFIG_ADC_FIFOSIZE=8
# #
# LED Support # LED Support
# #
# CONFIG_USERLED is not set
# CONFIG_RGBLED is not set # CONFIG_RGBLED is not set
# CONFIG_PCA9635PW is not set # CONFIG_PCA9635PW is not set
# CONFIG_NCP5623C is not set # CONFIG_NCP5623C is not set