Allow non contiguous analog pins definition

Signed-off-by: Frederic Pillon <[email protected]>
Co-Authored-By: MCUdude <[email protected]>

Author: fpistm

cores/arduino/pins_arduino.h

@@ -51,116 +51,170 @@ enum {
 };
 
 // Arduino analog pins
-#ifndef NUM_ANALOG_INPUTS
-#define NUM_ANALOG_INPUTS 0
-#endif
-#ifndef NUM_ANALOG_FIRST
-#define NUM_ANALOG_FIRST NUM_DIGITAL_PINS
-#endif
+// If NUM_ANALOG_INPUTS is not defined there is no analog pins defined.
+// Anyway ADC internal channels are always avaialable.
+#if defined(NUM_ANALOG_INPUTS) && (NUM_ANALOG_INPUTS>0)
 
+// If NUM_ANALOG_FIRST is defined, analog pins are defined contiguous
+// and defined hereafter
+#ifdef NUM_ANALOG_FIRST
 // Analog pins must be contiguous to be able to loop on each value
 #define MAX_ANALOG_INPUTS 24
 _Static_assert(NUM_ANALOG_INPUTS <= MAX_ANALOG_INPUTS,
                "Core NUM_ANALOG_INPUTS limited to MAX_ANALOG_INPUTS");
 _Static_assert(NUM_ANALOG_FIRST >= NUM_ANALOG_INPUTS,
                "First analog pin value (A0) must be greater than or equal to NUM_ANALOG_INPUTS");
+#endif /* NUM_ANALOG_FIRST */
 
 #if NUM_ANALOG_INPUTS > 0
+#ifndef PIN_A0
 #define PIN_A0       NUM_ANALOG_FIRST
+#endif
 static const uint8_t A0 = PIN_A0;
 #endif
 #if NUM_ANALOG_INPUTS > 1
+#ifndef PIN_A1
 #define PIN_A1       (PIN_A0 + 1)
+#endif
 static const uint8_t A1 = PIN_A1;
 #endif
 #if NUM_ANALOG_INPUTS > 2
+#ifndef PIN_A2
 #define PIN_A2       (PIN_A1 + 1)
+#endif
 static const uint8_t A2 = PIN_A2;
 #endif
 #if NUM_ANALOG_INPUTS > 3
+#ifndef PIN_A3
 #define PIN_A3       (PIN_A2 + 1)
+#endif
 static const uint8_t A3 = PIN_A3;
 #endif
 #if NUM_ANALOG_INPUTS > 4
+#ifndef PIN_A4
 #define PIN_A4       (PIN_A3 + 1)
+#endif
 static const uint8_t A4 = PIN_A4;
 #endif
 #if NUM_ANALOG_INPUTS > 5
+#ifndef PIN_A5
 #define PIN_A5       (PIN_A4 + 1)
+#endif
 static const uint8_t A5 = PIN_A5;
 #endif
 #if NUM_ANALOG_INPUTS > 6
+#ifndef PIN_A6
 #define PIN_A6       (PIN_A5 + 1)
+#endif
 static const uint8_t A6 = PIN_A6;
 #endif
 #if NUM_ANALOG_INPUTS > 7
+#ifndef PIN_A7
 #define PIN_A7       (PIN_A6 + 1)
+#endif
 static const uint8_t A7 = PIN_A7;
 #endif
 #if NUM_ANALOG_INPUTS > 8
+#ifndef PIN_A8
 #define PIN_A8       (PIN_A7 + 1)
+#endif
 static const uint8_t A8 = PIN_A8;
 #endif
 #if NUM_ANALOG_INPUTS > 9
+#ifndef PIN_A9
 #define PIN_A9       (PIN_A8 + 1)
+#endif
 static const uint8_t A9 = PIN_A9;
 #endif
 #if NUM_ANALOG_INPUTS > 10
+#ifndef PIN_A10
 #define PIN_A10      (PIN_A9 + 1)
+#endif
 static const uint8_t A10 = PIN_A10;
 #endif
 #if NUM_ANALOG_INPUTS > 11
+#ifndef PIN_A11
 #define PIN_A11      (PIN_A10 + 1)
+#endif
 static const uint8_t A11 = PIN_A11;
 #endif
 #if NUM_ANALOG_INPUTS > 12
+#ifndef PIN_A12
 #define PIN_A12      (PIN_A11 + 1)
+#endif
 static const uint8_t A12 = PIN_A12;
 #endif
 #if NUM_ANALOG_INPUTS > 13
+#ifndef PIN_A13
 #define PIN_A13      (PIN_A12 + 1)
+#endif
 static const uint8_t A13 = PIN_A13;
 #endif
 #if NUM_ANALOG_INPUTS > 14
+#ifndef PIN_A14
 #define PIN_A14      (PIN_A13 + 1)
+#endif
 static const uint8_t A14 = PIN_A14;
 #endif
 #if NUM_ANALOG_INPUTS > 15
+#ifndef PIN_A15
 #define PIN_A15      (PIN_A14 + 1)
+#endif
 static const uint8_t A15 = PIN_A15;
 #endif
 #if NUM_ANALOG_INPUTS > 16
+#ifndef PIN_A16
 #define PIN_A16      (PIN_A15 + 1)
+#endif
 static const uint8_t A16 = PIN_A16;
 #endif
 #if NUM_ANALOG_INPUTS > 17
+#ifndef PIN_A17
 #define PIN_A17      (PIN_A16 + 1)
+#endif
 static const uint8_t A17 = PIN_A17;
 #endif
 #if NUM_ANALOG_INPUTS > 18
+#ifndef PIN_A18
 #define PIN_A18      (PIN_A17 + 1)
+#endif
 static const uint8_t A18 = PIN_A18;
 #endif
 #if NUM_ANALOG_INPUTS > 19
+#ifndef PIN_A19
 #define PIN_A19      (PIN_A18 + 1)
+#endif
 static const uint8_t A19 = PIN_A19;
 #endif
 #if NUM_ANALOG_INPUTS > 20
+#ifndef PIN_A20
 #define PIN_A20      (PIN_A19 + 1)
+#endif
 static const uint8_t A20 = PIN_A20;
 #endif
 #if NUM_ANALOG_INPUTS > 21
+#ifndef PIN_A21
 #define PIN_A21      (PIN_A20 + 1)
+#endif
 static const uint8_t A21 = PIN_A21;
 #endif
 #if NUM_ANALOG_INPUTS > 22
+#ifndef PIN_A22
 #define PIN_A22      (PIN_A21 + 1)
+#endif
 static const uint8_t A22 = PIN_A22;
 #endif
 #if NUM_ANALOG_INPUTS > 23
+#ifndef PIN_A23
 #define PIN_A23      (PIN_A22 + 1)
+#endif
 static const uint8_t A23 = PIN_A23;
 #endif
+#else
+#ifndef NUM_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS 0
+#endif
+#endif /* NUM_ANALOG_INPUTS */
 
 // Default for Arduino connector compatibility
 // SPI Definitions
@@ -236,10 +290,15 @@ uint32_t pinNametoDigitalPin(PinName p);
 // Convert an analog pin number to a digital pin number
 #if defined(NUM_ANALOG_INPUTS) && (NUM_ANALOG_INPUTS>0)
 // Used by analogRead api to have A0 == 0
+#ifndef analogInputToDigitalPin
+// Default one for contiguous analog pins definition
 #define analogInputToDigitalPin(p)  (((uint32_t)p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#endif
 #else
+// No analog pin defined
 #define analogInputToDigitalPin(p)  (NUM_DIGITAL_PINS)
 #endif
+
 // Convert an analog pin number Axx to a PinName PX_n
 PinName analogInputToPinName(uint32_t pin);