diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-12-22 21:55:54 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-12-22 21:55:54 +0000 |
| commit | 9e3c18cfd114ffd892ead66460e9bc040904c25d (patch) | |
| tree | de611df330178a7c539127b3d7f26e5420094a7b /nuttx/configs/stm3240g-eval | |
| parent | a8ab2aef243697e99a0c9eba0b9d9fba98444b27 (diff) | |
| download | px4-nuttx-9e3c18cfd114ffd892ead66460e9bc040904c25d.tar.gz px4-nuttx-9e3c18cfd114ffd892ead66460e9bc040904c25d.tar.bz2 px4-nuttx-9e3c18cfd114ffd892ead66460e9bc040904c25d.zip | |
Update to the STM32 ADC and CAN drivers
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4215 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval')
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/README.txt | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/stm3240g-internal.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 78e70f400..fc0d67beb 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -254,6 +254,8 @@ Configuration Options: CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. CONFIG_STM32_CAN2 - Enable support for CAN1 CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. + CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an + dump of all CAN registers. STM3240G-EVAL-specific Configuration Options ============================================ @@ -528,6 +530,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_REGDEBUG - If CONFIG_DEBUG is set, this will generate an + dump of all CAN registers. STM3240G-EVAL LCD Hardware Configuration diff --git a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h index 32b9ff577..679951314 100644 --- a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h @@ -74,10 +74,8 @@ * PD1 = FSMC_D3 & CAN1_TX */ -#ifndef CONFIG_CAN_LOOPBACK -# if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_FSMC) -# warning "The STM3250G-EVAL will only support one of CAN1 and FSMC" -# endif +#if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_FSMC) +# warning "The STM3250G-EVAL will only support one of CAN1 and FSMC" #endif /* The USB OTG HS ULPI bus is shared with CAN2 bus: @@ -86,10 +84,8 @@ * PB5 = ULPI_D7 & CAN2_RX */ -#ifndef CONFIG_CAN_LOOPBACK -# if defined(CONFIG_STM32_CAN2) && defined(CONFIG_STM32_OTGHS) -# warning "The STM3250G-EVAL will only support one of CAN2 and USB OTG HS" -# endif +#if defined(CONFIG_STM32_CAN2) && defined(CONFIG_STM32_OTGHS) +# warning "The STM3250G-EVAL will only support one of CAN2 and USB OTG HS" #endif /* STM3240G-EVAL GPIOs ******************************************************************************/ |