X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/9d18e10afb2439a6a9ba6978a799259746a837b7..4bb0f0854a5aa7467512e0bd1e5bf4c724437d4e:/core/adc/adc.c?ds=inline

diff --git a/core/adc/adc.c b/core/adc/adc.c
index fdf2d30..0a6dd39 100644
--- a/core/adc/adc.c
+++ b/core/adc/adc.c
@@ -87,7 +87,7 @@ static uint8_t _adcLastChannel = 0;
                 be added to the adcInit function.
 */
 /**************************************************************************/
-uint32_t adcRead (uint8_t channelNum)
+uint32_t adcReadSingle (uint8_t channelNum)
 {
   if (!_adcInitialised) adcInit();
 
@@ -162,6 +162,87 @@ uint32_t adcRead (uint8_t channelNum)
   return (adcData);
 }
 
+/**************************************************************************/
+/*! 
+ @brief Returns the oversampled conversion results on the specified ADC channel.
+ 
+ This function will manually start A/D conversions on a single
+ channel sum and divide results to get a value of increased resolution. 
+ 
+ Read more: AVR121: Enhancing ADC resolution by oversampling [http://www.atmel.com/Images/doc8003.pdf]
+ 
+ @param[in]  channelNum
+ The A/D channel [0..7] that will be used during the A/D 
+ conversion.  (Note that only A/D channel's 0..3 are 
+ configured by default in adcInit.)
+
+ @param[in] extraBits
+ Additional bits you want to add to resolution. Hardware resolution is
+ 10bits, if 6 is psecified as extraBits, the resolution will be increated to
+ 16 bit. 
+ 
+ @return     0 if an overrun error occured, otherwise a 10-bit value
+ containing the A/D conversion results.
+ 
+ @warning    Only AD channels 0..3 are configured for A/D in adcInit.
+ If you wish to use A/D pins 4..7 they will also need to
+ be added to the adcInit function.
+ */
+/**************************************************************************/
+
+uint32_t adcReadOversampled (uint8_t channelNum, uint8_t extraBits) {
+    uint32_t sampleCount = 1 << (extraBits * 2);
+    uint16_t i;
+    uint32_t adcOversampled = 0;
+    
+    for(i = 0; i < sampleCount; i++) {
+        uint16_t adcValue = adcReadSingle(channelNum);
+        adcOversampled += adcValue;
+    }
+    
+    adcOversampled = adcOversampled >> extraBits;
+    return adcOversampled;
+}
+
+/**************************************************************************/
+/*! 
+    @brief Returns the conversion results on the specified ADC channel.
+
+    This function will manually start an A/D conversion on a single
+    channel and return the results.  If ADC Averaging is enabled
+    (via ADC_AVERAGING_ENABLE) the specified number of values will be
+    samples from the ADC and the average value will be returned.
+
+    @param[in]  channelNum
+                The A/D channel [0..7] that will be used during the A/D 
+                conversion.  (Note that only A/D channel's 0..3 are 
+                configured by default in adcInit.)
+
+    @return     0 if an overrun error occured, otherwise a 10-bit value
+                containing the A/D conversion results.
+
+    @warning    Only AD channels 0..3 are configured for A/D in adcInit.
+                If you wish to use A/D pins 4..7 they will also need to
+                be added to the adcInit function.
+*/
+/**************************************************************************/
+uint32_t adcRead (uint8_t channelNum)
+{
+  if (!_adcInitialised) adcInit();
+
+  #if ADC_AVERAGING_ENABLE
+    uint32_t adcTotal, i;
+    adcTotal = 0;
+    for (i=0; i<ADC_AVERAGING_SAMPLES;i++)
+    {
+      adcTotal += adcReadSingle(channelNum);
+    }
+    return adcTotal/ADC_AVERAGING_SAMPLES;
+  #else
+    return adcReadSingle(channelNum);
+  #endif
+}
+
 /**************************************************************************/
 /*! 
     @brief      Initialises the A/D converter and configures channels 0..3