X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fadc12%2FHplAdc12P.nc;h=2423dba00de14cc0044a31307aacf100a307906f;hb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;hp=7240e7668edc1a011c6ad9d85ca09632294677aa;hpb=1a329382c4f4556fd52d85f4e3f4a67e54911682;p=tinyos-2.x.git diff --git a/tos/chips/msp430/adc12/HplAdc12P.nc b/tos/chips/msp430/adc12/HplAdc12P.nc index 7240e766..2423dba0 100644 --- a/tos/chips/msp430/adc12/HplAdc12P.nc +++ b/tos/chips/msp430/adc12/HplAdc12P.nc @@ -113,16 +113,14 @@ implementation ADC12CTL0 &= ~(ADC12ON); } + async command void HplAdc12.enableConversion(){ + ADC12CTL0 |= ENC; + } + async command bool HplAdc12.isBusy(){ return ADC12CTL1 & ADC12BUSY; } TOSH_SIGNAL(ADC_VECTOR) { - uint16_t iv = ADC12IV; - switch(iv) - { - case 2: signal HplAdc12.memOverflow(); return; - case 4: signal HplAdc12.conversionTimeOverflow(); return; - } - signal HplAdc12.conversionDone(iv); + signal HplAdc12.conversionDone(ADC12IV); } }