jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32: adc-v2: pull up single/continuous modes

Browse Source
This commit is contained in:
Karl Palsson 2015-10-17 01:48:07 +00:00
parent a89cd86454
commit 7231b9a691
6 changed files with 26 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/common/adc_common_v2.h
View File

@ -46,6 +46,8 @@ bool adc_is_power_on(uint32_t adc);
void adc_power_off_async(uint32_t adc); void adc_power_off_async(uint32_t adc);
void adc_power_off(uint32_t adc); void adc_power_off(uint32_t adc);
bool adc_is_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 END_DECLS

2
include/libopencm3/stm32/f0/adc.h
View File

@ -275,8 +275,6 @@ enum adc_opmode {
BEGIN_DECLS BEGIN_DECLS
/* Operation mode API */ /* 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_enable_discontinuous_mode(uint32_t adc);
void adc_disable_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); void adc_set_operation_mode(uint32_t adc, enum adc_opmode opmode);

2
include/libopencm3/stm32/f3/adc.h
View File

@ -898,8 +898,6 @@ void adc_set_left_aligned(uint32_t adc);
void adc_set_right_aligned(uint32_t adc); void adc_set_right_aligned(uint32_t adc);
void adc_enable_dma(uint32_t adc); void adc_enable_dma(uint32_t adc);
void adc_disable_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(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_sample_time_on_all_channels(uint32_t adc, uint8_t time);
void adc_set_watchdog_high_threshold(uint32_t adc, uint8_t threshold); void adc_set_watchdog_high_threshold(uint32_t adc, uint8_t threshold);

24
lib/stm32/common/adc_common_v2.c
View File

@ -113,3 +113,27 @@ void adc_power_off(uint32_t adc)
while (!adc_is_power_off(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;
}

29
lib/stm32/f0/adc.c
View File

@ -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 /** @brief ADC Enable Discontinuous Mode for Regular Conversions
* *

30
lib/stm32/f3/adc.c
View File

@ -540,36 +540,6 @@ void adc_disable_dma(uint32_t adc)
ADC_CFGR1(adc) &= ~ADC_CFGR1_DMAEN; 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 /** @brief ADC Set the Sample Time for a Single Channel