diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-16 21:28:43 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-16 21:28:43 +0100 |
| commit | 4216982d54a858cb8ad8dbf68d2b7499348cd5e2 (patch) | |
| tree | b77fdf805ddefe7179311961fd248796369c2d65 /nuttx | |
| parent | caade93ae409595352db40d62828009f93752346 (diff) | |
| download | px4-firmware-4216982d54a858cb8ad8dbf68d2b7499348cd5e2.tar.gz px4-firmware-4216982d54a858cb8ad8dbf68d2b7499348cd5e2.tar.bz2 px4-firmware-4216982d54a858cb8ad8dbf68d2b7499348cd5e2.zip | |
Made timeouts configurable, untested
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 2 | ||||
| -rwxr-xr-x | nuttx/configs/px4fmu/nsh/defconfig | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index a66ac7e29..633275906 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -2013,7 +2013,7 @@ int up_i2creset(FAR struct i2c_dev_s * dev) /* Give up if we have tried too hard */ - if (clock_count++ > 1000) + if (clock_count++ > CONFIG_STM32_I2CTIMEOTICKS) { goto out; } diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig index fd783dec5..b579096ef 100755 --- a/nuttx/configs/px4fmu/nsh/defconfig +++ b/nuttx/configs/px4fmu/nsh/defconfig @@ -372,7 +372,8 @@ CONFIG_I2C_POLLED=y CONFIG_I2C_TRANSFER=y CONFIG_I2C_TRACE=n CONFIG_I2C_RESET=y - +# XXX fixed per-transaction timeout +CONFIG_STM32_I2CTIMEOMS=10 # XXX re-enable after integration testing |