ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #330 from toyowata/master 

[LPC1549] Fixed #327 ADC channel 1 issue
pull/333/head
Martin Kojtal 2014-05-27 09:14:13 +02:00
parent 3cec47a2d5 d8a81cde30
commit 9574629e27
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c
View File

@ -95,12 +95,18 @@ void analogin_init(analogin_t *obj, PinName pin) {
} }
static inline uint32_t adc_read(analogin_t *obj) { static inline uint32_t adc_read(analogin_t *obj) {
volatile uint32_t channels;
__IO LPC_ADC0_Type *adc_reg = (obj->adc < ADC1_0) ? (__IO LPC_ADC0_Type*)(LPC_ADC0) : (__IO LPC_ADC0_Type*)(LPC_ADC1); __IO LPC_ADC0_Type *adc_reg = (obj->adc < ADC1_0) ? (__IO LPC_ADC0_Type*)(LPC_ADC0) : (__IO LPC_ADC0_Type*)(LPC_ADC1);
if (obj->adc >= ADC1_0)
channels = ((obj->adc - ADC1_0) & 0x1F);
else
channels = (obj->adc & 0x1F);
// select channel // select channel
adc_reg->SEQA_CTRL &= ~(0xFFF); adc_reg->SEQA_CTRL &= ~(0xFFF);
adc_reg->SEQA_CTRL |= (1UL << (obj->adc & 0x1F)); adc_reg->SEQA_CTRL |= (1UL << channels);
// start conversion and sequence enable // start conversion and sequence enable
adc_reg->SEQA_CTRL |= ((1UL << 26) | (1UL << 31)); adc_reg->SEQA_CTRL |= ((1UL << 26) | (1UL << 31));