diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt index 8dce52d26a..f3417be287 100755 --- a/configs/hymini-stm32v/README.txt +++ b/configs/hymini-stm32v/README.txt @@ -499,6 +499,8 @@ HY-Mini 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. HY-MiniSTM32V LCD Hardware Configuration (SSD1289 controler) diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index 05face7f07..bdd06b0d18 100755 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -587,6 +587,8 @@ STM3210E-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. STM3210E-EVAL LCD Hardware Configuration diff --git a/configs/stm3210e-eval/src/up_adc.c b/configs/stm3210e-eval/src/up_adc.c index fa05f547b5..75ac6610a1 100644 --- a/configs/stm3210e-eval/src/up_adc.c +++ b/configs/stm3210e-eval/src/up_adc.c @@ -76,19 +76,19 @@ /* The number of ADC channels in the conversion list */ -#define ADC_NCHANNELS 2 +#define ADC_NCHANNELS 1 /************************************************************************************ * 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 */ -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 diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 78e70f4000..fc0d67beb5 100755 --- a/configs/stm3240g-eval/README.txt +++ b/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/configs/stm3240g-eval/src/stm3240g-internal.h b/configs/stm3240g-eval/src/stm3240g-internal.h index 32b9ff577c..679951314f 100644 --- a/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/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 ******************************************************************************/