diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-20 03:37:29 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-20 03:37:29 +0000 |
| commit | a89135e23145cd538db501fd5c8b60bc2fcd4cb3 (patch) | |
| tree | 11ea8443de9bdfb86fca51e6aef9c480a3af7ae2 /nuttx/configs/stm3240g-eval | |
| parent | 77c6594eb257557db6111945a3354ded40e41858 (diff) | |
| download | px4-nuttx-a89135e23145cd538db501fd5c8b60bc2fcd4cb3.tar.gz px4-nuttx-a89135e23145cd538db501fd5c8b60bc2fcd4cb3.tar.bz2 px4-nuttx-a89135e23145cd538db501fd5c8b60bc2fcd4cb3.zip | |
Leverage some bit timing logic from LPC17xx to the STM32 CAN driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4317 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval')
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/README.txt | 4 | ||||
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/nsh/defconfig | 2 | ||||
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/ostest/defconfig | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 95777bac3..238e2ad23 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -282,6 +282,8 @@ Configuration Options: CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. CONFIG_STM32_CAN2 - Enable support for CAN2 CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. + CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 + CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7 CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an dump of all CAN registers. @@ -535,6 +537,8 @@ STM3240G-EVAL-specific Configuration Options mode for testing. The STM32 CAN driver does support loopback mode. CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. + CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 + CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7 CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an dump of all CAN registers. diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 22bd97110..6135fa3e1 100755 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -269,6 +269,8 @@ CONFIG_SSI_POLLWAIT=y # mode for testing. The STM32 CAN driver does support loopback mode. # CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. # CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. +# CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 +# CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7 # CONFIG_CAN=n #CONFIG_CAN_FIFOSIZE diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig index 4811aaf39..2b18c69a2 100755 --- a/nuttx/configs/stm3240g-eval/ostest/defconfig +++ b/nuttx/configs/stm3240g-eval/ostest/defconfig @@ -269,6 +269,8 @@ CONFIG_SSI_POLLWAIT=y # mode for testing. The STM32 CAN driver does support loopback mode. # CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. # CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. +# CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 +# CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7 # CONFIG_CAN=n #CONFIG_CAN_FIFOSIZE @@ -986,7 +988,7 @@ CONFIG_USBSTRG_REMOVABLE=y # too many messages (CONFIG_PREALLOC_MQ_MSGS controls how many # messages are pre-allocated). # -CONFIG_NX=y +CONFIG_NX=n CONFIG_NX_MULTIUSER=n CONFIG_NX_NPLANES=1 CONFIG_NX_DISABLE_1BPP=y |