sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to the STM32 ADC and CAN drivers

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4215 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-12-22 21:55:54 +00:00
parent 9ff5eb279d
commit 4fb2f8f148
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/hymini-stm32v/README.txt
View File

@ -499,6 +499,8 @@ HY-Mini specific Configuration Options
mode for testing. The STM32 CAN driver does support loopback mode. 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_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_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.
HY-MiniSTM32V LCD Hardware Configuration (SSD1289 controler) HY-MiniSTM32V LCD Hardware Configuration (SSD1289 controler)

2
configs/stm3210e-eval/README.txt
View File

@ -587,6 +587,8 @@ STM3210E-EVAL-specific Configuration Options
mode for testing. The STM32 CAN driver does support loopback mode. 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_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_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.
STM3210E-EVAL LCD Hardware Configuration STM3210E-EVAL LCD Hardware Configuration

8
configs/stm3210e-eval/src/up_adc.c
View File

@ -76,19 +76,19 @@
/* The number of ADC channels in the conversion list */ /* The number of ADC channels in the conversion list */
#define ADC_NCHANNELS 2 #define ADC_NCHANNELS 1
/************************************************************************************ /************************************************************************************
* Private Data * Private Data
************************************************************************************/ ************************************************************************************/
/* Identifying number of each ADC channel: Variable Resistor and BNC_CN5 */ /* Identifying number of each ADC channel: Variable Resistor */
static const uint8_t g_chanlist[ADC_NCHANNELS] = {14, 11}; static const uint8_t g_chanlist[ADC_NCHANNELS] = {14};
/* Configurations of pins used byte each ADC channels */ /* Configurations of pins used byte each ADC channels */
static const uint32_t g_pinlist[ADC_NCHANNELS] = {GPIO_ADC1_IN14 , GPIO_ADC1_IN11}; static const uint32_t g_pinlist[ADC_NCHANNELS] = {GPIO_ADC1_IN14};
/************************************************************************************ /************************************************************************************
* Private Functions * Private Functions

4
configs/stm3240g-eval/README.txt
View File

@ -254,6 +254,8 @@ Configuration Options:
CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined.
CONFIG_STM32_CAN2 - Enable support for CAN1 CONFIG_STM32_CAN2 - Enable support for CAN1
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 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-specific Configuration Options 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. 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_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_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 STM3240G-EVAL LCD Hardware Configuration

8
configs/stm3240g-eval/src/stm3240g-internal.h
View File

@ -74,10 +74,8 @@
* PD1 = FSMC_D3 & CAN1_TX * PD1 = FSMC_D3 & CAN1_TX
*/ */
#ifndef CONFIG_CAN_LOOPBACK #if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_FSMC)
# if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_FSMC)
# warning "The STM3250G-EVAL will only support one of CAN1 and FSMC" # warning "The STM3250G-EVAL will only support one of CAN1 and FSMC"
# endif
#endif #endif
/* The USB OTG HS ULPI bus is shared with CAN2 bus: /* The USB OTG HS ULPI bus is shared with CAN2 bus:
@ -86,10 +84,8 @@
* PB5 = ULPI_D7 & CAN2_RX * PB5 = ULPI_D7 & CAN2_RX
*/ */
#ifndef CONFIG_CAN_LOOPBACK #if defined(CONFIG_STM32_CAN2) && defined(CONFIG_STM32_OTGHS)
# if defined(CONFIG_STM32_CAN2) && defined(CONFIG_STM32_OTGHS)
# warning "The STM3250G-EVAL will only support one of CAN2 and USB OTG HS" # warning "The STM3250G-EVAL will only support one of CAN2 and USB OTG HS"
# endif
#endif #endif
/* STM3240G-EVAL GPIOs ******************************************************************************/ /* STM3240G-EVAL GPIOs ******************************************************************************/