marc
/
RIOT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpu: cc430: make adc use xtimer

This commit is contained in:
Kaspar Schleiser 2015-08-14 14:06:49 +02:00
parent 9d088bb3d7
commit 87d2596819
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/cc430/cc430-adc.c
View File

@ -51,7 +51,7 @@
#include "irq.h"
#include "cpu.h"
#include "cc430-adc.h"
#include "hwtimer.h"
#include "xtimer.h"
uint16_t adc12_result;
uint8_t adc12_data_ready;
@ -74,8 +74,8 @@ uint16_t adc12_single_conversion(uint16_t ref, uint16_t sht, uint16_t channel)
ADC12IE = 0x001; /* ADC_IFG upon conv result-ADCMEMO */
enableIRQ();
/* Wait 2 ticks (66us) to allow internal reference to settle */
hwtimer_wait(2);
/* Wait 66us to allow internal reference to settle */
xtimer_usleep(66);
/* Start ADC12 */
ADC12CTL0 |= ADC12ENC;
@ -87,7 +87,7 @@ uint16_t adc12_single_conversion(uint16_t ref, uint16_t sht, uint16_t channel)
ADC12CTL0 |= ADC12SC;
/* Wait until ADC12 has finished */
hwtimer_wait(5);
xtimer_usleep(150);
while (!adc12_data_ready);