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

arch/arm/src/stm32/stm32_adc.c: Corect an error found in build testing. Recent commit to add STM32F1 calibration was not properly conditioned. Caused compilation errors on all STM32 F2 family members.

Browse Source
This commit is contained in:
Gregory Nutt 2019-08-31 17:06:24 -06:00
parent c6434e3182
commit 70fcf486a0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/stm32/hardware/stm32_adc_v1.h
View File

@ -45,6 +45,10 @@
#include "chip.h"
/****************************************************************************************************
* Pre-processor Definitions
****************************************************************************************************/
/* This is implementation for STM32 ADC IPv1 - F1, F2, F37x, F4, F7.
* NOTE: L1 use modified IPv1 (look at chip/stm32_adc_v1l1.h).
*/
@ -76,10 +80,6 @@
# undef HAVE_ADC_VBAT
#endif
/****************************************************************************************************
* Pre-processor Definitions
****************************************************************************************************/
/* For the basic ADC IPv1, the ADCx_BASE definitions are defined in chip/stm32xxx_memorymap.h files */
#ifndef HAVE_BASIC_ADC

2
arch/arm/src/stm32/stm32_adc.c
View File

@ -2405,7 +2405,7 @@ static void adc_calibrate(FAR struct stm32_dev_s *priv)
UNUSED(priv);
#endif
}
#elif defined(HAVE_IP_ADC_V1)
#elif defined(HAVE_IP_ADC_V1) && defined(HAVE_BASIC_ADC)
static void adc_calibrate(FAR struct stm32_dev_s *priv)
{
/* Power on the ADC */