riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/stm32: fix duplicated defs

Browse Source
This commit is contained in:
luisan00 2021-10-08 21:15:07 +02:00
parent 423da42d1c
commit 6459d4c344
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu/stm32/include/periph/f1/periph_cpu.h
View File

@ -52,6 +52,11 @@ extern "C" {
#define RTT_MAX_FREQUENCY (RTT_CLOCK_FREQUENCY / 2) /* in Hz */ #define RTT_MAX_FREQUENCY (RTT_CLOCK_FREQUENCY / 2) /* in Hz */
/** @} */ /** @} */
/**
* @brief Available number of ADC devices
*/
#define ADC_DEVS (2U)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

17
cpu/stm32/include/periph_cpu.h
View File

@ -485,23 +485,6 @@ typedef enum {
#define DMA_DATA_WIDTH_SHIFT (0) #define DMA_DATA_WIDTH_SHIFT (0)
/** @} */ /** @} */
/**
* @brief Available number of ADC devices
*/
#if defined(CPU_FAM_STM32F1) || defined(CPU_FAM_STM32F2)
#define ADC_DEVS (2U)
#elif defined(CPU_LINE_STM32F401xE) || defined(CPU_LINE_STM32F410Rx) \
|| defined(CPU_LINE_STM32F411xE) || defined(CPU_LINE_STM32F412Zx) \
|| defined(CPU_LINE_STM32F413xx) || defined(CPU_LINE_STM32F423xx) \
|| defined(CPU_MODEL_STM32L452RE) || defined(CPU_MODEL_STM32L432KC)
#define ADC_DEVS (1U)
#elif defined(CPU_LINE_STM32F405xx) || defined(CPU_LINE_STM32F407xx) \
|| defined(CPU_LINE_STM32F415xx) || defined(CPU_LINE_STM32F429xx) \
|| defined(CPU_LINE_STM32F437xx) || defined(CPU_LINE_STM32F446xx) \
|| defined(CPU_MODEL_STM32L476RG) || defined(CPU_MODEL_STM32L475VG)
#define ADC_DEVS (3U)
#endif
/** /**
* @brief ADC channel configuration data * @brief ADC channel configuration data
*/ */