EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started some cleanup in the ADC headers and convenience code.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2012-03-19 17:38:24 -07:00
parent 4fbd42148a
commit 451a5e227d
2 changed files with 163 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/stm32/f1/adc.c
View File

@@ -197,9 +197,9 @@ void adc_enable_external_trigger_regular(u32 adc, u8 trigger)
{
u32 reg32;
reg32 = (ADC_CR2(adc) & 0xfff1ffff); /* Clear bits [19:17]. */
reg32 = (ADC_CR2(adc) & ~(ADC_CR2_EXTSEL_MASK));
if (trigger < 8)
reg32 |= (trigger << ADC_CR2_EXTSEL_LSB);
reg32 |= (trigger);
ADC_CR2(adc) = reg32;
ADC_CR2(adc) |= ADC_CR2_EXTTRIG;
}
@@ -213,9 +213,9 @@ void adc_enable_external_trigger_injected(u32 adc, u8 trigger)
{
u32 reg32;
reg32 = (ADC_CR2(adc) & 0xffff8fff); /* Clear bits [12:14]. */
reg32 = (ADC_CR2(adc) & ~(ADC_CR2_JEXTSEL_MASK)); /* Clear bits [12:14]. */
if (trigger < 8)
reg32 |= (trigger << ADC_CR2_JEXTSEL_LSB);
reg32 |= (trigger);
ADC_CR2(adc) = reg32;
ADC_CR2(adc) |= ADC_CR2_JEXTTRIG;
}