aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-08-26 08:14:52 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-08-26 08:14:52 +0200
commita54ef70a207cd892a9ef406df6f1aa0732035537 (patch)
tree34ad86de79213c9d08d851e7c0e92ff32aaf7c0a /nuttx-configs
parent9825ed8f3cd037b8fd131a911ba350a29203ef0c (diff)
downloadpx4-firmware-a54ef70a207cd892a9ef406df6f1aa0732035537.tar.gz
px4-firmware-a54ef70a207cd892a9ef406df6f1aa0732035537.tar.bz2
px4-firmware-a54ef70a207cd892a9ef406df6f1aa0732035537.zip
Decrease I2C timeout in config so it matches the previous 500 us timeout as close as possible. This is necessary after fixing the NuttX I2C timeout logic
Diffstat (limited to 'nuttx-configs')
-rw-r--r--nuttx-configs/px4fmu-v1/nsh/defconfig3
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig3
-rwxr-xr-xnuttx-configs/px4io-v1/nsh/defconfig2
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