Internal ADC channels correctly removed from variants. Updated example. Variants modified.

In normal course, general pins are converted to pads. With this commit any pin number over 99 is treated as a special internal ADC channel. These 'pins' are not converted to pads via ap3_gpio_pin2pad() (calls the board variant).

ADC works correctly. The analogRead was updated as well. Internal temp is now more accurately calculated. All variants updated.

Author: nseidle

cores/arduino/ard_sup/analog/ap3_analog.cpp

@@ -129,7 +129,17 @@ uint16_t analogRead(uint8_t pinNumber)
     am_hal_adc_sample_t Sample;
     uint32_t ui32NumSamples = 1;
 
-    uint8_t padNumber = ap3_gpio_pin2pad(pinNumber);
+    uint8_t padNumber;
+
+    if (pinNumber >= ADC_DIFF0 && pinNumber <= ADC_INTERNAL_VSS)
+    {
+        //Special handling of internal ADC channels
+        padNumber = pinNumber;
+    }
+    else
+    {
+        padNumber = ap3_gpio_pin2pad(pinNumber);
+    }
 
     //Look up configuration status based on pad number
     uint8_t indi;
@@ -292,18 +302,7 @@ ap3_err_t ap3_set_pin_to_analog(uint8_t pinNumber)
 
     uint8_t funcsel = 0;
     am_hal_gpio_pincfg_t pincfg = INPUT;
-
-    //Handle special ADC channels
-    if (pinNumber >= ADC_DIFF0 && pinNumber <= ADC_INTERNAL_VSS)
-    {
-        //Don't use the pin to pad lookup from the variant file
-        retval = ap3_analog_pad_funcsel(pinNumber, &funcsel);
-    }
-    else
-    {
-        //Normal pin lookup
-        retval = ap3_analog_pad_funcsel(ap3_gpio_pin2pad(pinNumber), &funcsel);
-    }
+    retval = ap3_analog_pad_funcsel(ap3_gpio_pin2pad(pinNumber), &funcsel);
 
     if (retval != AP3_OK)
     {

cores/arduino/ard_sup/ap3_analog_types.h

@@ -28,7 +28,7 @@ SOFTWARE.
 
 enum EXTRA_ADC_PADS
 {
-    AP3_ADC_DIFF0_PAD = 51, //More than physical pads on Apollo3
+    AP3_ADC_DIFF0_PAD = 100, //More than physical pads on Apollo3
     AP3_ADC_DIFF1_PAD,
     AP3_ADC_TEMP_PAD,
     AP3_ADC_DIV3_PAD,

libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino

@@ -13,7 +13,7 @@
 
   Feel like supporting open source hardware?
   Buy a board from SparkFun!
-  SparkFun Edge: https://www.sparkfun.com/products/15170
+  SparkFun Edge: https://www.sparkfun.com/artemis
 
   Hardware Connections:
   Upload code
@@ -30,37 +30,37 @@ void setup()
 
   pinMode(LED, OUTPUT);
 
-  //analogReadResolution(14); //Set resolution to 14 bit
+  analogReadResolution(14); //Set resolution to 14 bit
   //analogReadResolution(16); //Set resolution to 16 bit - will pad ADC output with two zeros
 }
 
 void loop()
 {
   digitalWrite(LED, LOW);
 
-  int myValue1 = analogRead(A1); //Automatically sets pin to analog input
-  Serial.print("A1: ");
+  int myValue1 = analogRead(A3); //Automatically sets pin to analog input
+  Serial.print("A3: ");
   Serial.print(myValue1);
 
-  int internalTemp = analogRead(ADC_TEMP); //Read internal temp sensor. 3.8mV/C, +/-3C
-  Serial.print("\tinternalTemp: ");
-  Serial.print(internalTemp);
-
-  int vss = analogRead(ADC_VSS); //Read internal VSS
-  Serial.print("\tvss: ");
-  Serial.print(vss);
-
   //TODO enable battload
-  int div3 = analogRead(ADC_DIV3); //Read VCC across a 1/3 resistor divider
+  int div3 = analogRead(ADC_INTERNAL_VCC_DIV3); //Read VCC across a 1/3 resistor divider
   Serial.print("\tVCC/3: ");
   Serial.print(div3);
 
-  float vcc = (float)div3 * 6 / 1024.0; //Convert 1/3 VCC to VCC
+  float vcc = (float)div3 * 6 / 16384.0; //Convert 1/3 VCC to VCC
   Serial.print(" VCC: ");
   Serial.print(vcc, 2);
   Serial.print("V");
 
-  //pinMode(A4, OUTPUT); //Reset analog function to false.
+  int internalTempVoltage = analogRead(ADC_INTERNAL_TEMP); //Read internal temp sensor. 3.8mV/C, +/-3C
+  double internalTemp = internalTempVoltage * vcc / 16384.0; //Convert internal temp reading to voltage
+  internalTemp /= 0.0038; //Convert voltage to degrees C
+  Serial.print("\tinternalTemp: ");
+  Serial.print(internalTemp, 2);
+
+  int vss = analogRead(ADC_INTERNAL_VSS); //Read internal VSS (should be 0)
+  Serial.print("\tvss: ");
+  Serial.print(vss);
 
   Serial.println();
 

variants/SparkFun_BlackBoard_Artemis_ATP/config/variant.cpp

@@ -70,15 +70,10 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
     43,
     44,
     45,
-    46,
+    AP3_GPIO_PAD_UNUSED, //The one pad not broken out of the Apollo3 on the Artemis
     47,
     48,
     49,
-    AP3_ADC_DIFF0_PAD, //50 - Not a real pad, ADC_DIFF0
-    AP3_ADC_DIFF1_PAD, //51 - Not a real pad, ADC_DIFF1
-    AP3_ADC_TEMP_PAD,  //52 - Not a real pad, ADC_TEMP
-    AP3_ADC_DIV3_PAD,  //53 - Not a real pad, ADC_DIV3
-    AP3_ADC_VSS_PAD,   //54 - Not a real pad, ADC_VSS
 };
 
 // Uart Definitions

variants/SparkFun_BlackBoard_Artemis_ATP/config/variant.h

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "Arduino.h"
 
-#define AP3_VARIANT_NUM_PINS (55)
+#define AP3_VARIANT_NUM_PINS (50)
 
 // Pin map declaration
 extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS];
@@ -58,12 +58,6 @@ extern Uart Serial1;
 #define A33 33
 #define A35 35
 
-#define ADC_DIFF0 50 //Not legal pins. Used for pad lookup
-#define ADC_DIFF1 51
-#define ADC_TEMP 52
-#define ADC_DIV3 53
-#define ADC_VSS 54
-
 #define LED_BUILTIN 5
 
 // Pins with dedicated silk covering the pin number

variants/SparkFun_BlackBoard_Artemis_Nano/config/variant.cpp

@@ -25,35 +25,30 @@ SOFTWARE.
 const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
     //~ = PWM, A = ADC
     //Apollo Pad, //Silkscreen indicator
-    13,                //A0 - ~I2SBCLK/RX1
-    33,                //A1 - ~SWO/32kHz
-    11,                //A2 - ~PDMDATA
-    29,                //A3 - ~PDMDATA
-    18,                //4 - ~CMPIN1/SCCIO
-    31,                //A5 - ~SCCCLK
-    43,                //6 - ~SDA3/MISO3/RX1
-    42,                //7 - SCL3/SCK3/TX1
-    38,                //8 - MOSI3/RX1
-    39,                //9 - ~SCL4/SCK4/TX1
-    40,                //10 - SDA4/MISO4/RX1
-    5,                 //11 - ~SCL0/SCK0
-    7,                 //12 - ~MOSI0/CLKOUT
-    6,                 //13 - ~SDA0/MISO0/I2SDAT
-    35,                //A14 - ~TX1/I2SDAT/PDMCLK
-    32,                //A15 - ~SCCIO
-    12,                //A16 - ~PDMCLK/TX1
-    32,                //17 - ~SDA2/MISO3/RX1
-    12,                //18 - ~SCL2/SCK2
-    19,                //19 - ~Not exposed, Status LED
-    48,                //20 - Not exposed, TX0
-    49,                //21 - Not exposed, RX0
-    36,                //22 - Not exposed, PDMDATA of Mic
-    37,                //23 - Not exposed, PDMCLK of Mic
-    AP3_ADC_DIFF0_PAD, //24 - Not a real pad, ADC_DIFF0
-    AP3_ADC_DIFF1_PAD, //25 - Not a real pad, ADC_DIFF1
-    AP3_ADC_TEMP_PAD,  //26 - Not a real pad, ADC_TEMP
-    AP3_ADC_DIV3_PAD,  //27 - Not a real pad, ADC_DIV3
-    AP3_ADC_VSS_PAD,   //28 - Not a real pad, ADC_VSS
+    13, //A0 - ~I2SBCLK/RX1
+    33, //A1 - ~SWO/32kHz
+    11, //A2 - ~PDMDATA
+    29, //A3 - ~PDMDATA
+    18, //4 - ~CMPIN1/SCCIO
+    31, //A5 - ~SCCCLK
+    43, //6 - ~SDA3/MISO3/RX1
+    42, //7 - SCL3/SCK3/TX1
+    38, //8 - MOSI3/RX1
+    39, //9 - ~SCL4/SCK4/TX1
+    40, //10 - SDA4/MISO4/RX1
+    5,  //11 - ~SCL0/SCK0
+    7,  //12 - ~MOSI0/CLKOUT
+    6,  //13 - ~SDA0/MISO0/I2SDAT
+    35, //A14 - ~TX1/I2SDAT/PDMCLK
+    32, //A15 - ~SCCIO
+    12, //A16 - ~PDMCLK/TX1
+    32, //17 - ~SDA2/MISO3/RX1
+    12, //18 - ~SCL2/SCK2
+    19, //19 - ~Not exposed, Status LED
+    48, //20 - Not exposed, TX0
+    49, //21 - Not exposed, RX0
+    36, //22 - Not exposed, PDMDATA of Mic
+    37, //23 - Not exposed, PDMCLK of Mic
 };
 
 // Uart Definitions

variants/SparkFun_BlackBoard_Artemis_Nano/config/variant.h

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "Arduino.h"
 
-#define AP3_VARIANT_NUM_PINS (29)
+#define AP3_VARIANT_NUM_PINS (24)
 
 // Pin map declaration
 extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS];