Implements ADC functions

cores/arduino/wiring.c

@@ -32,6 +32,24 @@ extern "C" {
  */
 uint32_t SystemCoreClock=1000000ul ;
 
+void calibrateADC()
+{
+  volatile uint32_t valeur = 0;
+
+  for(int i = 0; i < 5; ++i)
+  {
+    ADC->SWTRIG.bit.START = 1;
+    while( ADC->INTFLAG.bit.RESRDY == 0 || ADC->STATUS.bit.SYNCBUSY == 1 )
+    {
+      // Waiting for a complete conversion and complete synchronization
+    }
+
+    valeur += ADC->RESULT.bit.RESULT;
+  }
+
+  valeur = valeur/5;
+}
+
 /*
  * Arduino Zero board initialization
  *
@@ -79,10 +97,29 @@ void init( void )
   // Todo
 
   // Initialize Analog Controller
-  // Todo
+  //Setting clock
+  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_ADC ) | // Generic Clock ADC
+                      GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
+                      GCLK_CLKCTRL_CLKEN ;
+
+  ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128 |     // Divide Clock by 512.
+                   ADC_CTRLB_RESSEL_10BIT;        // Result on 10 bits
+
+  ADC->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;   // No Negative input (Internal Ground)
+
+  // Averaging (see table 31-2 p.816 datasheet)
+  ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_2 |    // 2 samples
+                     ADC_AVGCTRL_ADJRES(0x01ul);  // Adjusting result by 1
+  
+  ADC->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA; // RReference AREFA (pin AREF) [default]
+
+  ADC->CTRLA.bit.ENABLE = 1; // Enable ADC
+  while( ADC->STATUS.bit.SYNCBUSY == 1 )
+  {
+    // Waiting for synchroinization
+  }
 }
 
 #ifdef __cplusplus
 }
 #endif
-

cores/arduino/wiring_analog.c

@@ -23,35 +23,51 @@
 extern "C" {
 #endif
 
+void analogReference( eAnalogReference ulMode )
+{
+  switch(ulMode)
+  {
+    case INTERNAL:
+      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val;
+      break;
+
+    case AR_DEFAULT:
+    default:
+      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;
+      break;
+  }
+}
 uint32_t analogRead( uint32_t ulPin )
 {
-  uint32_t ulValue = 0 ;
-/*
-  uint32_t ulChannel ;
+  uint32_t valueRead = 0;
+  pinPeripheral(ulPin, g_APinDescription[ulPin].ulPinType);
 
-  ulChannel = g_APinDescription[ulPin].ulADCChannelNumber ;
+  ADC->INPUTCTRL.bit.MUXPOS = g_APinDescription[ulPin].ulADCChannelNumber;
 
-  static uint32_t latestSelectedChannel = -1;
+  // Start conversion
+  ADC->SWTRIG.bit.START = 1;
 
-  switch ( g_APinDescription[ulPin].ulAnalogChannel )
+  while( ADC->INTFLAG.bit.RESRDY == 0 || ADC->STATUS.bit.SYNCBUSY == 1 )
   {
-    // Handling ADC 12 bits channels
-    case ADC0 :
-    case ADC1 :
-    case ADC2 :
-    case ADC3 :
-    case ADC4 :
-    case ADC5 :
-    break;
-    // Compiler could yell because we don't handle DAC pin
-    default :
-      ulValue=0;
-    break;
+    // Waiting for a complete conversion and complete synchronization
   }
-*/
 
-  return ulValue;
- }
+  // Store the value
+  valueRead = ADC->RESULT.reg;
+
+  // Clear the Data Ready flag
+  ADC->INTFLAG.bit.RESRDY = 1;
+
+  // Flush the ADC for further conversions
+  //ADC->SWTRIG.bit.FLUSH = 1;
+
+  while( ADC->STATUS.bit.SYNCBUSY == 1 || ADC->SWTRIG.bit.FLUSH == 1 )
+  {
+    // Waiting for synchronization
+  }
+
+  return valueRead;
+}
 
 
 // Right now, PWM output only works on the pins with

cores/arduino/wiring_analog.h

@@ -31,6 +31,7 @@ extern "C" {
 typedef enum _eAnalogReference
 {
   AR_DEFAULT,
+  INTERNAL
 } eAnalogReference ;
 
 /*

cores/validation/validation_core/build_as6/test.cppproj

@@ -37,23 +37,23 @@
         </dependencies>
       </framework-data>
     </AsfFrameworkConfig>
-    <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
+    <avrtool>com.atmel.avrdbg.tool.samice</avrtool>
     <avrtoolinterface>SWD</avrtoolinterface>
     <com_atmel_avrdbg_tool_samice>
       <ToolOptions>
         <InterfaceProperties>
+          <SwdClock>4000000</SwdClock>
         </InterfaceProperties>
         <InterfaceName>SWD</InterfaceName>
       </ToolOptions>
       <ToolType>com.atmel.avrdbg.tool.samice</ToolType>
-      <ToolNumber>28001042</ToolNumber>
+      <ToolNumber>28010306</ToolNumber>
       <ToolName>SAM-ICE</ToolName>
     </com_atmel_avrdbg_tool_samice>
     <UseGdb>True</UseGdb>
     <com_atmel_avrdbg_tool_edbg>
       <ToolOptions>
         <InterfaceProperties>
-          <SwdClock>4000000</SwdClock>
         </InterfaceProperties>
         <InterfaceName>SWD</InterfaceName>
       </ToolOptions>

cores/validation/validation_core/test.cpp

@@ -30,6 +30,11 @@ static uint32_t ul_Interrupt_Pin5 = 0 ;
 static uint32_t ul_Interrupt_Pin6 = 0 ;
 static uint32_t ul_Interrupt_Pin7 = 0 ;
 
+int temps = 0;
+int valX = 0;
+int valY = 0;
+
+
 void setup( void )
 {
   // Initialize the digital pin as an output.
@@ -113,15 +118,15 @@ void loop( void )
   analogWrite(  5, duty_cycle ) ;
   analogWrite(  4, duty_cycle ) ;
 
-  Serial5.print("Analog pins: ");
+  Serial5.print("\r\nAnalog pins: ");
 
-  for ( uint32_t i = A1 ; i <= A0+NUM_ANALOG_INPUTS ; i++ )
+  for ( uint32_t i = A0 ; i <= A0+NUM_ANALOG_INPUTS ; i++ )
   {
-/*
+
     int a = analogRead(i);
     Serial5.print(a, DEC);
     Serial5.print(" ");
-*/
+
   }
   Serial5.println();
 

variants/arduino_zero/variant.h

@@ -153,12 +153,12 @@ static const uint8_t SCK  = PIN_SPI_SCK;
 /*
  * Analog pins
  */
-static const uint8_t A0  = 20 ;
-static const uint8_t A1  = 21 ;
-static const uint8_t A2  = 22 ;
-static const uint8_t A3  = 23 ;
-static const uint8_t A4  = 24 ;
-static const uint8_t A5  = 25 ;
+static const uint8_t A0  = 24 ;
+static const uint8_t A1  = 25 ;
+static const uint8_t A2  = 26 ;
+static const uint8_t A3  = 27 ;
+static const uint8_t A4  = 28 ;
+static const uint8_t A5  = 29 ;
 #define ADC_RESOLUTION		12
 
 /*