diff options
| author | px4dev <px4@purgatory.org> | 2013-01-28 21:58:55 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-28 21:58:55 -0800 |
| commit | 9197df46dd82d00a4b79f264be5a4018b3bc98b1 (patch) | |
| tree | 62b7be8030e73331d16fddc38b00c352b546f4b7 /nuttx | |
| parent | 338f7692022a2be638a965f200576b995869d1ef (diff) | |
| parent | 2f7a7ccf0aa05caa834ab3b8511778a3b607696c (diff) | |
| download | px4-firmware-9197df46dd82d00a4b79f264be5a4018b3bc98b1.tar.gz px4-firmware-9197df46dd82d00a4b79f264be5a4018b3bc98b1.tar.bz2 px4-firmware-9197df46dd82d00a4b79f264be5a4018b3bc98b1.zip | |
Merge branch 'master' into px4io-i2c
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 1 | ||||
| -rwxr-xr-x | nuttx/configs/px4fmu/nsh/defconfig | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 5a85a8877..a03d1d3dc 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -92,6 +92,7 @@ CONFIGURED_APPS += fixedwing_att_control CONFIGURED_APPS += fixedwing_pos_control CONFIGURED_APPS += position_estimator CONFIGURED_APPS += attitude_estimator_ekf +CONFIGURED_APPS += hott_telemetry # Hacking tools #CONFIGURED_APPS += system/i2c diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig index 696d19a6c..fd783dec5 100755 --- a/nuttx/configs/px4fmu/nsh/defconfig +++ b/nuttx/configs/px4fmu/nsh/defconfig @@ -201,6 +201,12 @@ CONFIG_STM32_TIM10=y CONFIG_STM32_TIM11=y # +# Enable single wire support. If this is not defined, then this mode cannot +# be enabled. +# +CONFIG_STM32_USART_SINGLEWIRE=y + +# # We want the flash prefetch on for max performance. # STM32_FLASH_PREFETCH=y |