diff --git a/include/libopencm3/stm32/common/adc_common_v2.h b/include/libopencm3/stm32/common/adc_common_v2.h index 9d6a960d..e767cead 100644 --- a/include/libopencm3/stm32/common/adc_common_v2.h +++ b/include/libopencm3/stm32/common/adc_common_v2.h @@ -46,6 +46,8 @@ bool adc_is_power_on(uint32_t adc); void adc_power_off_async(uint32_t adc); void adc_power_off(uint32_t adc); bool adc_is_power_off(uint32_t adc); +void adc_set_continuous_conversion_mode(uint32_t adc); +void adc_set_single_conversion_mode(uint32_t adc); END_DECLS diff --git a/include/libopencm3/stm32/f0/adc.h b/include/libopencm3/stm32/f0/adc.h index 5e4cc877..5ef2f1b1 100644 --- a/include/libopencm3/stm32/f0/adc.h +++ b/include/libopencm3/stm32/f0/adc.h @@ -275,8 +275,6 @@ enum adc_opmode { BEGIN_DECLS /* Operation mode API */ -void adc_set_continuous_conversion_mode(uint32_t adc); -void adc_set_single_conversion_mode(uint32_t adc); void adc_enable_discontinuous_mode(uint32_t adc); void adc_disable_discontinuous_mode(uint32_t adc); void adc_set_operation_mode(uint32_t adc, enum adc_opmode opmode); diff --git a/include/libopencm3/stm32/f3/adc.h b/include/libopencm3/stm32/f3/adc.h index 048275bc..c6802a18 100644 --- a/include/libopencm3/stm32/f3/adc.h +++ b/include/libopencm3/stm32/f3/adc.h @@ -898,8 +898,6 @@ void adc_set_left_aligned(uint32_t adc); void adc_set_right_aligned(uint32_t adc); void adc_enable_dma(uint32_t adc); void adc_disable_dma(uint32_t adc); -void adc_set_continuous_conversion_mode(uint32_t adc); -void adc_set_single_conversion_mode(uint32_t adc); void adc_set_sample_time(uint32_t adc, uint8_t channel, uint8_t time); void adc_set_sample_time_on_all_channels(uint32_t adc, uint8_t time); void adc_set_watchdog_high_threshold(uint32_t adc, uint8_t threshold); diff --git a/lib/stm32/common/adc_common_v2.c b/lib/stm32/common/adc_common_v2.c index fc7f8b85..ab7c63e0 100644 --- a/lib/stm32/common/adc_common_v2.c +++ b/lib/stm32/common/adc_common_v2.c @@ -113,3 +113,27 @@ void adc_power_off(uint32_t adc) while (!adc_is_power_off(adc)); } +/** + * Enable Continuous Conversion Mode + * In this mode the ADC starts a new conversion of a single channel or a channel + * group immediately following completion of the previous channel group + * conversion. + * + * @param[in] adc ADC block register address base @ref adc_reg_base + */ +void adc_set_continuous_conversion_mode(uint32_t adc) +{ + ADC_CFGR1(adc) |= ADC_CFGR1_CONT; +} + +/** + * Enable Single Conversion Mode + * In this mode the ADC performs a conversion of one channel or a channel group + * and stops. + * + * @param[in] adc ADC block register address base @ref adc_reg_base + */ +void adc_set_single_conversion_mode(uint32_t adc) +{ + ADC_CFGR1(adc) &= ~ADC_CFGR1_CONT; +} diff --git a/lib/stm32/f0/adc.c b/lib/stm32/f0/adc.c index 949443ed..af007358 100644 --- a/lib/stm32/f0/adc.c +++ b/lib/stm32/f0/adc.c @@ -44,35 +44,6 @@ * *@{*/ -/*---------------------------------------------------------------------------*/ -/** @brief ADC Enable Continuous Conversion Mode - * - * In this mode the ADC starts a new conversion of a single channel or a channel - * group immediately following completion of the previous channel group - * conversion. - * - * @param[in] adc Unsigned int32. ADC base address (@ref adc_reg_base) - */ - -void adc_set_continuous_conversion_mode(uint32_t adc) -{ - ADC_CFGR1(adc) |= ADC_CFGR1_CONT; -} - -/*---------------------------------------------------------------------------*/ -/** @brief ADC Enable Single Conversion Mode - * - * In this mode the ADC performs a conversion of one channel or a channel group - * and stops. - * - * @param[in] adc Unsigned int32. ADC base address (@ref adc_reg_base) - */ - -void adc_set_single_conversion_mode(uint32_t adc) -{ - ADC_CFGR1(adc) &= ~ADC_CFGR1_CONT; -} - /*---------------------------------------------------------------------------*/ /** @brief ADC Enable Discontinuous Mode for Regular Conversions * diff --git a/lib/stm32/f3/adc.c b/lib/stm32/f3/adc.c index e8d7f82d..06e2cc3d 100644 --- a/lib/stm32/f3/adc.c +++ b/lib/stm32/f3/adc.c @@ -540,36 +540,6 @@ void adc_disable_dma(uint32_t adc) ADC_CFGR1(adc) &= ~ADC_CFGR1_DMAEN; } -/*---------------------------------------------------------------------------*/ -/** @brief ADC Enable Continuous Conversion Mode - * - * In this mode the ADC starts a new conversion of a single channel or a channel - * group immediately following completion of the previous channel group - * conversion. - * - * @param[in] adc Unsigned int32. ADC block register address base - * @ref adc_reg_base - */ - -void adc_set_continuous_conversion_mode(uint32_t adc) -{ - ADC_CFGR(adc) |= ADC_CFGR_CONT; -} - -/*---------------------------------------------------------------------------*/ -/** @brief ADC Enable Single Conversion Mode - * - * In this mode the ADC performs a conversion of one channel or a channel group - * and stops. - * - * @param[in] adc Unsigned int32. ADC block register address base - * @ref adc_reg_base - */ - -void adc_set_single_conversion_mode(uint32_t adc) -{ - ADC_CFGR(adc) &= ~ADC_CFGR_CONT; -} /*---------------------------------------------------------------------------*/ /** @brief ADC Set the Sample Time for a Single Channel