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

Merge branch 'master' of bitbucket.org:nuttx/nuttx

Browse Source
This commit is contained in:
Gregory Nutt 2017-10-26 09:25:46 -06:00
commit 4d344b36a3
8 changed files with 1549 additions and 666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/src/stm32f7/Kconfig
View File

@ -1737,11 +1737,6 @@ config STM32F7_I2CTIMEOTICKS
default 500
depends on STM32F7_I2C && !STM32F7_I2C_DYNTIMEO
config STM32F7_I2C_DUTY16_9
bool "Frequency with Tlow/Thigh = 16/9 "
default n
depends on STM32F7_I2C
endmenu # "I2C Configuration"
menu "SD/MMC Configuration"

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

@ -2522,6 +2522,7 @@ static int stm32_i2c_reset(FAR struct i2c_master_s * dev)
unsigned int stretch_count;
uint32_t scl_gpio;
uint32_t sda_gpio;
uint32_t frequency;
int ret = ERROR;
ASSERT(dev);
@ -2538,6 +2539,10 @@ static int stm32_i2c_reset(FAR struct i2c_master_s * dev)
stm32_i2c_sem_wait(dev);
/* Save the current frequency */
frequency = priv->frequency;
/* De-init the port */
stm32_i2c_deinit(priv);
@ -2613,6 +2618,10 @@ static int stm32_i2c_reset(FAR struct i2c_master_s * dev)
/* Re-init the port */
stm32_i2c_init(priv);
/* Restore the frequency */
stm32_i2c_setclock(priv, frequency);
ret = OK;
out:

5
arch/arm/src/stm32l4/Kconfig
View File

@ -3715,11 +3715,6 @@ config STM32L4_I2CTIMEOTICKS
default 500
depends on STM32L4_I2C && !STM32L4_I2C_DYNTIMEO
config STM32L4_I2C_DUTY16_9
bool "Frequency with Tlow/Thigh = 16/9 "
default n
depends on STM32L4_I2C
endmenu
menu "SD/MMC Configuration"

2130
arch/arm/src/stm32l4/stm32l4_i2c.c
View File

File diff suppressed because it is too large Load Diff

2
configs/nucleo-l496zg/nsh/defconfig
View File

@ -95,6 +95,8 @@ CONFIG_STM32L4_TIM1=y
CONFIG_STM32L4_USART2=y
CONFIG_STM32L4_USART3=y
CONFIG_SYSTEM_I2CTOOL=y
CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4
CONFIG_SYSTEM_STACKMONITOR=y
CONFIG_SYSTEM_TEE=y
CONFIG_TASK_NAME_SIZE=0

7
configs/olimex-stm32-h407/README.txt
View File

@ -8,6 +8,7 @@ The H407 was programmed with ST-LINK/V2 from both Win8.1 and Ubuntu 14.04
This release provides baseline for H407 12MHZ clock in include/board.h
nsh - Only basic shell response tested on USART2
nsh_uext - Basic shell response tested on USART6 (UEXT)
Development Environment
=======================
@ -31,7 +32,11 @@ UARTs
=====
On the H407 board, ?? all uarts are available for pin mappings
USART2 is typically used for nsh console
USART2 can be used for nsh console like on Discovery board,
or you can use USART6 exposed via UEXT connector.
Olimex offers MOD-RS232 voltage level convertor for the UEXT so it can be
attached to computer serial port.
STM32-H407-specific Configuration Options
===============================================

7
configs/olimex-stm32-h407/include/board.h
View File

@ -256,6 +256,13 @@
#define GPIO_USART2_CTS GPIO_USART2_CTS_1
#define GPIO_USART2_RTS GPIO_USART2_RTS_1
/* USART6: (UEXT connector) */
#define GPIO_USART6_RX GPIO_USART6_RX_1
#define GPIO_USART6_TX GPIO_USART6_TX_1
/* GPIO_USART6_CTS and GPIO_USART6_RTS aren't used for UEXT */
/* CAN: */
#define GPIO_CAN1_RX GPIO_CAN1_RX_2 /* PB8 */

50
configs/olimex-stm32-h407/nsh_uext/defconfig Normal file
View File

@ -0,0 +1,50 @@
CONFIG_ARCH="arm"
CONFIG_ARCH_BOARD="olimex-stm32-h407"
CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y
CONFIG_ARCH_BUTTONS=y
# CONFIG_ARCH_FPU is not set
CONFIG_ARCH_CHIP_STM32F407ZG=y
CONFIG_ARCH_CHIP_STM32=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_REGIONS=2
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NFILE_STREAMS=8
# CONFIG_NSH_ARGCAT is not set
CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_CMDOPT_DF_H is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_NSH_CMDPARMS is not set
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_PREALLOC_TIMERS=4
CONFIG_PREALLOC_WDOGS=16
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200
CONFIG_SDCLONE_DISABLE=y
CONFIG_SCHED_WAITPID=y
# CONFIG_SPI_EXCHANGE is not set
CONFIG_SPI=y
CONFIG_START_YEAR=2016
CONFIG_STM32_JTAG_SW_ENABLE=y
CONFIG_STM32_OTGFS=y
CONFIG_STM32_PWR=y
CONFIG_STM32_USART2=y
CONFIG_STM32_USART6=y
CONFIG_USART2_RXBUFSIZE=128
CONFIG_USART2_TXBUFSIZE=128
CONFIG_USART6_SERIAL_CONSOLE=y
CONFIG_USER_ENTRYPOINT="nsh_main"