Handle analogRead(n) for n in 8..15

cores/arduino/wiring_analog.c

@@ -274,6 +274,11 @@ uint32_t analogRead(uint32_t pin)
   if (pin <= 5) {
     pin += A0;
   }
+#if NUM_ANALOG_INPUTS > 8
+  else if (pin < 16) {     // Grand Central's extra 8 pins are discontinuous
+    pin += PIN_A8 - 8;     //   and are on LOWER digital Pins than A0..A7
+  }
+#endif
 
   pinPeripheral(pin, PIO_ANALOG);
  //ATSAMR, for example, doesn't have a DAC

variants/arduino_mzero/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (34u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (19u)
 #define NUM_ANALOG_INPUTS    (5u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/blm_badge/variant.cpp

@@ -98,3 +98,4 @@ void SERCOM1_Handler()
   WIRE_IT_HANDLER();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/blm_badge/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (20u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (17u)
 #define NUM_ANALOG_INPUTS    (5u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/circuitplay/variant.cpp

@@ -119,3 +119,4 @@ void SERCOM4_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/circuitplay/variant.h

@@ -37,7 +37,7 @@
 // ----
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (39u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (39u)
 #define NUM_ANALOG_INPUTS    (11u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/crickit_m0/variant.cpp

@@ -110,3 +110,4 @@ void SERCOM5_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/crickit_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/feather_m0/variant.cpp

@@ -137,3 +137,4 @@ void SERCOM5_Handler()
   Serial5.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/feather_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (8u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/feather_m0_express/variant.cpp

@@ -126,3 +126,4 @@ void SERCOM0_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/feather_m0_express/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (42u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (42u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/feather_m4/variant.cpp

@@ -138,3 +138,4 @@ void SERCOM5_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/feather_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (40u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (6u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/feather_m4_can/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (43u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (23u)
 #define NUM_ANALOG_INPUTS    (6u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/gemma_m0/variant.cpp

@@ -95,3 +95,4 @@ void SERCOM0_Handler()
   WIRE_IT_HANDLER();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/gemma_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (16u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (16u)
 #define NUM_ANALOG_INPUTS    (3u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/grand_central_m4/variant.cpp

@@ -217,3 +217,4 @@ void SERCOM0_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/grand_central_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (96)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (53)
 #define NUM_ANALOG_INPUTS    (19)
 #define NUM_ANALOG_OUTPUTS   (2)

variants/hallowing_m0_express/variant.cpp

@@ -128,3 +128,4 @@ void SERCOM2_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/hallowing_m0_express/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (42u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (42u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/hallowing_m4/variant.cpp

@@ -146,3 +146,4 @@ void SERCOM4_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/hallowing_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (50u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (50u)
 #define NUM_ANALOG_INPUTS    (10u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/itsybitsy_m0/variant.cpp

@@ -124,3 +124,4 @@ void SERCOM0_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/itsybitsy_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/itsybitsy_m4/variant.cpp

@@ -129,3 +129,4 @@ void SERCOM3_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/itsybitsy_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (38u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (26u)
 #define NUM_ANALOG_INPUTS    (7u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/matrixportal_m4/variant.cpp

@@ -171,3 +171,4 @@ void SERCOM4_3_Handler()
 {
   Serial2.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/matrixportal_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (40u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (6u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/metro_m0/variant.cpp

@@ -125,3 +125,4 @@ void SERCOM0_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/metro_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (8u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/metro_m4/variant.cpp

@@ -146,3 +146,4 @@ void SERCOM3_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/metro_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (8u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/metro_m4_airlift/variant.cpp

@@ -170,3 +170,4 @@ void SERCOM0_3_Handler()
 {
   Serial2.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/metro_m4_airlift/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (49u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (20u)
 #define NUM_ANALOG_INPUTS    (8u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/mkr1000/variant.h

@@ -36,7 +36,7 @@
 // ----
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (7u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/mkrzero/variant.h

@@ -36,7 +36,7 @@
 // ----
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (26u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (15u)
 #define NUM_ANALOG_INPUTS    (7u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/monster_m4sk/variant.cpp

@@ -105,3 +105,4 @@ SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
 SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/monster_m4sk/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (37u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (37u)
 #define NUM_ANALOG_INPUTS    (4u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/pirkey/variant.cpp

@@ -94,3 +94,4 @@ void SERCOM1_Handler()
   Serial1.IrqHandler();
 }
 
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pirkey/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (22u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (5u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/pybadge_airlift_m4/variant.cpp

@@ -152,3 +152,4 @@ void SERCOM5_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pybadge_airlift_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (55u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (25u)
 #define NUM_ANALOG_INPUTS    (10u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/pybadge_m4/variant.cpp

@@ -150,3 +150,4 @@ void SERCOM5_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pybadge_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (51u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (25u)
 #define NUM_ANALOG_INPUTS    (10u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/pygamer_advance_m4/variant.cpp

@@ -149,3 +149,4 @@ void SERCOM5_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pygamer_advance_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (54u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (25u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/pygamer_m4/variant.cpp

@@ -149,3 +149,4 @@ void SERCOM5_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pygamer_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (54u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (25u)
 #define NUM_ANALOG_INPUTS    (12u)
 #define NUM_ANALOG_OUTPUTS   (2u)

variants/pyportal_m4/variant.cpp

@@ -149,3 +149,4 @@ void SERCOM4_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pyportal_m4/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (52u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (42u)
 #define NUM_ANALOG_INPUTS    (9u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/pyportal_m4_titano/variant.cpp

@@ -149,3 +149,4 @@ void SERCOM4_3_Handler()
 {
   Serial1.IrqHandler();
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/pyportal_m4_titano/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (52u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (42u)
 #define NUM_ANALOG_INPUTS    (9u)
 #define NUM_ANALOG_OUTPUTS   (1u)

variants/qtpy_m0/variant.cpp

@@ -84,3 +84,4 @@ void initVariant(void) {
   pinMode(12, OUTPUT);
   digitalWrite(12, HIGH);
 }
+const int PINS_COUNT = sizeof(g_APinDescription)/sizeof(*g_APinDescription);

variants/qtpy_m0/variant.h

@@ -53,7 +53,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (21u)
+extern const int PINS_COUNT;
 #define NUM_DIGITAL_PINS     (21u)
 #define NUM_ANALOG_INPUTS    (9u)
 #define NUM_ANALOG_OUTPUTS   (1u)