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

stm32: adc-v2: pull up start_regular

Browse Source 
Little steps are easy to review, and easy to test.
This commit is contained in:
Karl Palsson 2016-01-29 21:10:04 +00:00
parent 8b7a5ce7aa
commit 81319a96fb
7 changed files with 20 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,7 @@ void adc_disable_overrun_interrupt(uint32_t adc);
bool adc_get_overrun_flag(uint32_t adc); bool adc_get_overrun_flag(uint32_t adc);
void adc_clear_overrun_flag(uint32_t adc); void adc_clear_overrun_flag(uint32_t adc);
uint32_t adc_read_regular(uint32_t adc); uint32_t adc_read_regular(uint32_t adc);
void adc_start_conversion_regular(uint32_t adc);
END_DECLS END_DECLS

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

@ -149,6 +149,8 @@ specific memorymap.h header before including this header file.*/
BEGIN_DECLS BEGIN_DECLS
void adc_set_sample_time(uint32_t adc, uint8_t channel, uint8_t time);
END_DECLS END_DECLS
#endif #endif

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

@ -166,9 +166,6 @@ void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger,
uint32_t polarity); uint32_t polarity);
void adc_disable_external_trigger_regular(uint32_t adc); void adc_disable_external_trigger_regular(uint32_t adc);
/* Conversion API */
void adc_start_conversion_regular(uint32_t adc);
/* Interrupt configuration */ /* Interrupt configuration */
void adc_enable_watchdog_interrupt(uint32_t adc); void adc_enable_watchdog_interrupt(uint32_t adc);
void adc_disable_watchdog_interrupt(uint32_t adc); void adc_disable_watchdog_interrupt(uint32_t adc);

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

@ -597,11 +597,9 @@ void adc_enable_all_awd_interrupt(uint32_t adc);
void adc_disable_all_awd_interrupt(uint32_t adc); void adc_disable_all_awd_interrupt(uint32_t adc);
void adc_enable_eos_interrupt(uint32_t adc); void adc_enable_eos_interrupt(uint32_t adc);
void adc_disable_eos_interrupt(uint32_t adc); void adc_disable_eos_interrupt(uint32_t adc);
void adc_start_conversion_regular(uint32_t adc);
void adc_start_conversion_injected(uint32_t adc); void adc_start_conversion_injected(uint32_t adc);
void adc_disable_external_trigger_regular(uint32_t adc); void adc_disable_external_trigger_regular(uint32_t adc);
void adc_disable_external_trigger_injected(uint32_t adc); void adc_disable_external_trigger_injected(uint32_t adc);
void adc_set_sample_time(uint32_t adc, uint8_t channel, 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);
void adc_set_watchdog_low_threshold(uint32_t adc, uint8_t threshold); void adc_set_watchdog_low_threshold(uint32_t adc, uint8_t threshold);
void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[]); void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[]);

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

@ -337,3 +337,20 @@ void adc_disable_vrefint(void)
{ {
ADC_CCR(ADC1) &= ~ADC_CCR_VREFEN; ADC_CCR(ADC1) &= ~ADC_CCR_VREFEN;
} }
/** @brief ADC Software Triggered Conversion on Regular Channels
*
* This starts conversion on a set of defined regular channels. It is cleared
* by hardware once conversion starts.
*
* @param[in] adc ADC block register address base @ref adc_reg_base
*/
void adc_start_conversion_regular(uint32_t adc)
{
/* Start conversion on regular channels. */
ADC_CR(adc) |= ADC_CR_ADSTART;
/* Wait until the ADC starts the conversion. */
while (ADC_CR(adc) & ADC_CR_ADSTART);
}

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

@ -144,36 +144,6 @@ void adc_set_operation_mode(uint32_t adc, enum adc_opmode opmode)
/**@}*/ /**@}*/
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
/**
* @defgroup adc_api_result ADC Result API
* @ingroup adc_file
*
* @brief ADC Result API
*
*@{*/
/*---------------------------------------------------------------------------*/
/** @brief ADC Software Triggered Conversion on Regular Channels
*
* This starts conversion on a set of defined regular channels. It is cleared
* by hardware once conversion starts.
*
* @param[in] adc Unsigned int32. ADC base address (@ref adc_reg_base)
*/
void adc_start_conversion_regular(uint32_t adc)
{
/* Start conversion on regular channels. */
ADC_CR(adc) |= ADC_CR_ADSTART;
/* Wait until the ADC starts the conversion. */
while (ADC_CR(adc) & ADC_CR_ADSTART);
}
/**@}*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**

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

@ -430,25 +430,6 @@ void adc_disable_eos_interrupt(uint32_t adc)
} }
/*---------------------------------------------------------------------------*/
/** @brief ADC Software Triggered Conversion on Regular Channels
*
* This starts conversion on a set of defined regular channels. It is cleared
* by hardware once conversion starts.
*
* @param[in] adc Unsigned int32. ADC block register address base @ref
* adc_reg_base
*/
void adc_start_conversion_regular(uint32_t adc)
{
/* Start conversion on regular channels. */
ADC_CR(adc) |= ADC_CR_ADSTART;
/* Wait until the ADC starts the conversion. */
while (ADC_CR(adc) & ADC_CR_ADSTART);
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief ADC Software Triggered Conversion on Injected Channels /** @brief ADC Software Triggered Conversion on Injected Channels
* *