diff options
Diffstat (limited to '2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c')
-rw-r--r-- | 2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c | 54 |
1 files changed, 45 insertions, 9 deletions
diff --git a/2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c b/2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c index 71fe1363..302f8c82 100644 --- a/2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c +++ b/2.3-1/src/c/hardware/avr/adc/u8AVRReadADCs.c @@ -1,3 +1,13 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +// +// This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in + // Function to get voltage on analog pin on AVR // // Calling Sequence @@ -22,25 +32,51 @@ // // Authors // Siddhesh Wani -// +// Ashish Kamble #include "AVRPeripheralADC.h" -uint16 u8AVRReadADCs(uint8 channel) +uint8 u8AVRReadADCs(uint8 channel) { - /*Set ADC conversion channel*/ - ADMUX |= (channel & 0x1F); + +uint8 i; + + ADCH=0x00; + + i=channel&0x07; + ADMUX=i|0x60; //i|0x40 for 10 bits + ADCSRA|=1<<ADSC; + + while(ADCSRA & (1<<ADSC)); // wait for conv. to complete + uint8 temp=ADCH; //unsigned int temp=ADC; for 10 bits + + return temp; + +} + + + + + + + + + + +/*Set ADC conversion channel*/ +// ADMUX |= (channel & 0x1F); /*Start ADC conversion. Set 'ADSC' bit*/ - ADCSRA |= (1<<6); +// ADCSRA |= (1<<6); /*Wait for conversion to complete. Check 'ADIF' bit*/ - while(!(ADCSRA & (1<<4))); +// while(!(ADCSRA & (1<<4))); /*Clear ADIF flag*/ - ADCSRA |= (1<<4); +// ADCSRA |= (1<<4); /*ADC conversion result is stored in ADCH/L registers*/ - return (ADC); -} +// return (ADC); + + |