diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-28 14:16:57 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-28 14:16:57 +0200 |
| commit | 03d30acec504dd9393d0254ac01f2c594f78c40c (patch) | |
| tree | 9a08c7631bf229eddb9b030923fc4ce70102f713 | |
| parent | 2c724685d88727c6b0635561e8e285cef9add776 (diff) | |
| parent | 3dc1d868d1f9e4ef27c366d80be129c67da42920 (diff) | |
| download | px4-firmware-03d30acec504dd9393d0254ac01f2c594f78c40c.tar.gz px4-firmware-03d30acec504dd9393d0254ac01f2c594f78c40c.tar.bz2 px4-firmware-03d30acec504dd9393d0254ac01f2c594f78c40c.zip | |
Merge pull request #1320 from PX4/i2c_timeout
Decrease I2C timeout in config so it matches the previous 500 us timeout...
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 3 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 3 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v1/nsh/defconfig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index d7697cd67..cd9c05b13 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -287,8 +287,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 -CONFIG_STM32_I2CTIMEOMS=10 -CONFIG_STM32_I2CTIMEOTICKS=500 +CONFIG_STM32_I2CTIMEOMS=1 # CONFIG_STM32_I2C_DUTY16_9 is not set # diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index bd956f7bf..e31f40cd2 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -323,8 +323,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 -CONFIG_STM32_I2CTIMEOMS=10 -CONFIG_STM32_I2CTIMEOTICKS=500 +CONFIG_STM32_I2CTIMEOMS=1 # CONFIG_STM32_I2C_DUTY16_9 is not set # diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig index 512c6a0f2..7c76be7ec 100755 --- a/nuttx-configs/px4io-v1/nsh/defconfig +++ b/nuttx-configs/px4io-v1/nsh/defconfig @@ -133,6 +133,8 @@ CONFIG_STM32_USART2=y CONFIG_STM32_USART3=y CONFIG_STM32_I2C1=y CONFIG_STM32_I2C2=n +CONFIG_STM32_I2CTIMEOSEC=0 +CONFIG_STM32_I2CTIMEOMS=1 CONFIG_STM32_BKP=n CONFIG_STM32_PWR=n CONFIG_STM32_DAC=n |