Clean up old way to define Ax pins definition

NUM_ANALOG_FIRST is no more supported. Only analogInputPin array is. Signed-off-by: Frederic Pillon <[email protected]>
stm32duino · fpistm · Apr 17, 2021 · Jun 5, 2020 · Jul 10, 2020 · Jul 16, 2020
commit 4afab8480889b098baebf04e748e4a5b08395dec
diff --git a/cores/arduino/pins_arduino.c b/cores/arduino/pins_arduino.c
@@ -71,16 +71,12 @@ bool pinIsAnalogInput(uint32_t pin)
 {
   bool ret = false;
 #if NUM_ANALOG_INPUTS > 0
-#ifndef NUM_ANALOG_LAST
-  ret = (pin >= A0) && (pin < (A0 + NUM_ANALOG_INPUTS));
-#else
   for (uint32_t i = 0; i < NUM_ANALOG_INPUTS; i++) {
     if (analogInputPin[i] == pin) {
       ret = true;
       break;
     }
   }
-#endif /* NUM_ANALOG_LAST */
 #endif /* NUM_ANALOG_INPUTS > 0 */
   return ret;
 }
@@ -89,16 +85,12 @@ uint32_t digitalPinToAnalogInput(uint32_t pin)
 {
   uint32_t ret = NUM_ANALOG_INPUTS;
 #if NUM_ANALOG_INPUTS > 0
-#ifndef NUM_ANALOG_LAST
-  ret = pin - A0;
-#else
   for (uint32_t i = 0; i < NUM_ANALOG_INPUTS; i++) {
     if (analogInputPin[i] == pin) {
       ret = i;
       break;
     }
   }
-#endif /* NUM_ANALOG_LAST */
 #endif /* NUM_ANALOG_INPUTS > 0 */
   return ret;
 }

diff --git a/cores/arduino/pins_arduino.h b/cores/arduino/pins_arduino.h
@@ -30,9 +30,6 @@ _Static_assert(LastPort <= 0x0F, "PortName must be less than 16");
 
 _Static_assert(NUM_ANALOG_INPUTS <= MAX_ANALOG_INPUTS,
                "Core NUM_ANALOG_INPUTS limited to MAX_ANALOG_INPUTS");
-/* Analog pins must be contiguous to be able to loop on each value */
-_Static_assert(NUM_ANALOG_FIRST >= NUM_ANALOG_INPUTS,
-               "First analog pin value (A0) must be greater than or equal to NUM_ANALOG_INPUTS");
 
 /* Default for Arduino connector compatibility */
 /* SPI Definitions */
@@ -86,34 +83,29 @@ extern const uint32_t analogInputPin[];
 #define NOT_AN_INTERRUPT            (uint32_t)NC
 
 /* Convert a digital pin number Dxx to a PinName PX_n */
+#if NUM_ANALOG_INPUTS > 0
 /* Note: Analog pin is also a digital pin */
-#ifndef NUM_ANALOG_LAST
-#define digitalPinToPinName(p)      (((uint32_t)p < NUM_DIGITAL_PINS) ? digitalPin[p] : NC)
-#else
 #define digitalPinToPinName(p)      (((uint32_t)p < NUM_DIGITAL_PINS) ? digitalPin[p] : \
             ((uint32_t)p >= NUM_ANALOG_FIRST) && ((uint32_t)p <= NUM_ANALOG_LAST) ? \
                                                 digitalPin[analogInputPin[p-NUM_ANALOG_FIRST]] : NC)
-#endif
+#else
+#define digitalPinToPinName(p)      (((uint32_t)p < NUM_DIGITAL_PINS) ? digitalPin[p] : NC)
+#endif /* NUM_ANALOG_INPUTS > 0 */
 /* Convert a PinName PX_n to a digital pin number */
 uint32_t pinNametoDigitalPin(PinName p);
 
 /* Convert an analog pin number to a digital pin number */
 #if NUM_ANALOG_INPUTS > 0
 /* Used by analogRead api to have A0 == 0 */
-/* For contiguous analog pins definition in digitalPin array */
-#ifndef NUM_ANALOG_LAST
-#define analogInputToDigitalPin(p)  (((uint32_t)p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
-#else
-/* For non contiguous analog pins definition in digitalPin array */
+/* Non contiguous analog pins definition in digitalPin array */
 #define analogInputToDigitalPin(p)  ( \
             ((uint32_t)p < NUM_ANALOG_INPUTS) ? analogInputPin[p] : \
             ((uint32_t)p >= NUM_ANALOG_FIRST) && ((uint32_t)p <= NUM_ANALOG_LAST) ? \
                                                 analogInputPin[p-NUM_ANALOG_FIRST] : p)
-#endif // !NUM_ANALOG_LAST
 #else
 /* No analog pin defined */
 #define analogInputToDigitalPin(p)  (NUM_DIGITAL_PINS)
-#endif // NUM_ANALOG_INPUTS > 0
+#endif /* NUM_ANALOG_INPUTS > 0 */
 
 /* Convert an analog pin number Axx to a PinName PX_n */
 PinName analogInputToPinName(uint32_t pin);

diff --git a/cores/arduino/pins_arduino_analog.h b/cores/arduino/pins_arduino_analog.h
@@ -20,18 +20,9 @@
   #define NUM_ANALOG_INPUTS 0
 #endif
 
-/*
- * If NUM_ANALOG_FIRST is not defined:
- * - Ax are not contiguous in the digitalPin array
- * - analogInputPin array is available
- */
-#ifndef NUM_ANALOG_FIRST
-  #define NUM_ANALOG_FIRST          (NUM_DIGITAL_PINS + 1)
-  #define NUM_ANALOG_LAST           (NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS)
-  #define NUM_ANALOG_INTERNAL_FIRST (NUM_ANALOG_LAST + 1)
-#else
-  #define NUM_ANALOG_INTERNAL_FIRST (NUM_DIGITAL_PINS + 1)
-#endif
+#define NUM_ANALOG_FIRST          (NUM_DIGITAL_PINS + 1)
+#define NUM_ANALOG_LAST           (NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS)
+#define NUM_ANALOG_INTERNAL_FIRST (NUM_ANALOG_LAST + 1)
 
 /* ADC internal channels (not a pins) */
 /* Only used for analogRead() */

diff --git a/variants/STM32F0xx/DISCO_F072RB/variant.cpp b/variants/STM32F0xx/DISCO_F072RB/variant.cpp
@@ -111,6 +111,26 @@ const PinName digitalPin[] = {
   PB_12, //D50
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  31, // A0
+  32, // A1
+  33, // A2
+  34, // A3
+  35, // A4
+  36, // A5
+  37, // A6
+  38, // A7
+  39, // A8
+  40, // A9
+  41, // A10
+  42, // A11
+  43, // A12
+  44, // A13
+  45, // A14
+  46  // A15
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/variants/STM32F0xx/DISCO_F072RB/variant.h b/variants/STM32F0xx/DISCO_F072RB/variant.h
@@ -86,22 +86,22 @@ extern "C" {
 #define PC15 28
 #define PF0  29
 #define PF1  30
-#define PC0  31 // A0 - NCS_MEMS_SPI (L3GD20)
-#define PC1  32 // A1 - MEMS INT1 (L3GD20)
-#define PC2  33 // A2 - MEMS INT2 (L3GD20)
-#define PC3  34 // A3
-#define PA0  35 // A4 - USER_BTN
-#define PA1  36 // A5
-#define PA2  37 // A6 - SB27 (default OFF): TS_G1_IO3
-#define PA3  38 // A7 - SB28 (default OFF): TS_G1_IO4
-#define PA4  39 // A8
-#define PA5  40 // A9
-#define PA6  41 // A10 - SB29 (default OFF): TS_G2_IO3
-#define PA7  42 // A11 - SB30 (default OFF): TS_G2_IO4
-#define PC4  43 // A12
-#define PC5  44 // A13 - Ext Reset
-#define PB0  45 // A14 - SB31 (default OFF): TS_G3_IO2
-#define PB1  46 // A15 - SB32 (default OFF): TS_G3_IO3
+#define PC0  A0 // NCS_MEMS_SPI (L3GD20)
+#define PC1  A1 // MEMS INT1 (L3GD20)
+#define PC2  A2 // MEMS INT2 (L3GD20)
+#define PC3  A3
+#define PA0  A4 // USER_BTN
+#define PA1  A5
+#define PA2  A6 // SB27 (default OFF): TS_G1_IO3
+#define PA3  A7 // SB28 (default OFF): TS_G1_IO4
+#define PA4  A8
+#define PA5  A9
+#define PA6  A10 // SB29 (default OFF): TS_G2_IO3
+#define PA7  A11 // SB30 (default OFF): TS_G2_IO4
+#define PC4  A12
+#define PC5  A13 // Ext Reset
+#define PB0  A14 // SB31 (default OFF): TS_G3_IO2
+#define PB1  A15 // SB32 (default OFF): TS_G3_IO3
 #define PB2  47
 #define PB10 48 // I2C2 SCL: Extension / RF EEprom Connector
 #define PB11 49 // I2C2 SDA: Extension / RF EEprom Connector
@@ -111,7 +111,6 @@ extern "C" {
 #define NUM_DIGITAL_PINS        51
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       16
-#define NUM_ANALOG_FIRST        31
 
 //On-board LED pin number
 #define LED_BUILTIN             PC9

diff --git a/variants/STM32F0xx/EEXTR_F030_V1/variant.cpp b/variants/STM32F0xx/EEXTR_F030_V1/variant.cpp
@@ -77,6 +77,13 @@ const PinName digitalPin[] = {
   PB_9,  // D38
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  5, // A0
+  6, // A1
+  7  // A2
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/variants/STM32F0xx/EEXTR_F030_V1/variant.h b/variants/STM32F0xx/EEXTR_F030_V1/variant.h
@@ -45,9 +45,9 @@ extern "C" {
 #define PC15 2
 #define PF0  3
 #define PF1  4
-#define PA0  5  // A0
-#define PA1  6  // A1
-#define PA2  7  // A2
+#define PA0  A0
+#define PA1  A1
+#define PA2  A2
 #define PA3  8
 #define PA4  9
 #define PA5  10
@@ -84,17 +84,10 @@ extern "C" {
 #define NUM_DIGITAL_PINS        39
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       3
-#define NUM_ANALOG_FIRST        5
-
-//On-board LED pin number
-//#define LED_BUILTIN             -1
-
-//On-board user button
-//#define USER_BTN                -1
 
 // SPI definitions
 // SPI1 is used
-#define PIN_SPI_SS              -1
+#define PIN_SPI_SS              NC
 #define PIN_SPI_MOSI            PA7
 #define PIN_SPI_MISO            PA6
 #define PIN_SPI_SCK             PA5

diff --git a/variants/STM32F0xx/ELEKTOR_F072Cx/variant.cpp b/variants/STM32F0xx/ELEKTOR_F072Cx/variant.cpp
@@ -78,6 +78,20 @@ const PinName digitalPin[] = {
   PF_1   //D38
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  25, // A0
+  26, // A1
+  27, // A2
+  28, // A3
+  29, // A4
+  30, // A5
+  31, // A6
+  32, // A7
+  33, // A8
+  34  // A9
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/variants/STM32F0xx/ELEKTOR_F072Cx/variant.h b/variants/STM32F0xx/ELEKTOR_F072Cx/variant.h
@@ -64,24 +64,22 @@ extern "C" {
 #define  PC13   22
 #define  PC14   23
 #define  PC15   24
-#define  PA0    25
-#define  PA1    26
-#define  PA2    27
-#define  PA3    28
-#define  PA4    29
-#define  PA5    30
-#define  PA6    31
-#define  PA7    32
-#define  PB0    33
-#define  PB1    34
+#define  PA0    A0
+#define  PA1    A1
+#define  PA2    A2
+#define  PA3    A3
+#define  PA4    A4
+#define  PA5    A5
+#define  PA6    A6
+#define  PA7    A7
+#define  PB0    A8
+#define  PB1    A9
 #define  PF0    35
 #define  PF1    36
 
-
 // This must be a literal
 #define NUM_DIGITAL_PINS        37
 #define NUM_ANALOG_INPUTS       10
-#define NUM_ANALOG_FIRST        26
 
 // On-board LED pin number
 #define LED_BUILTIN             PA15

diff --git a/variants/STM32F0xx/MALYANMx00_F070CB/variant.cpp b/variants/STM32F0xx/MALYANMx00_F070CB/variant.cpp
@@ -83,6 +83,20 @@ const PinName digitalPin[] = {
   PA_14, //D34 - SWCLK
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  20, // A0
+  21, // A1
+  22, // A2
+  23, // A3
+  24, // A4
+  25, // A5
+  26, // A6
+  27, // A7
+  28, // A8
+  29  // A9
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/variants/STM32F0xx/MALYANMx00_F070CB/variant.h b/variants/STM32F0xx/MALYANMx00_F070CB/variant.h
@@ -86,16 +86,16 @@ extern "C" {
 #define PC13 17
 #define PC14 18
 #define PC15 19
-#define PA0  20 // A0
-#define PA1  21 // A1
-#define PA2  22 // A2
-#define PA3  23 // A3
-#define PA4  24 // A4
-#define PA5  25 // A5
-#define PA6  26 // A6
-#define PA7  27 // A7
-#define PB0  28 // A8
-#define PB1  29 // A9
+#define PA0  A0
+#define PA1  A1
+#define PA2  A2
+#define PA3  A3
+#define PA4  A4
+#define PA5  A5
+#define PA6  A6
+#define PA7  A7
+#define PB0  A8
+#define PB1  A9
 #define PB10 30
 #define PB11 31
 // Other
@@ -107,7 +107,6 @@ extern "C" {
 #define NUM_DIGITAL_PINS        35
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       10
-#define NUM_ANALOG_FIRST        20
 
 // On-board LED pin number
 #ifdef ARDUINO_MALYANM200_F070CB

diff --git a/variants/STM32F0xx/NUCLEO_F031K6/variant.cpp b/variants/STM32F0xx/NUCLEO_F031K6/variant.cpp
@@ -38,17 +38,29 @@ const PinName digitalPin[] = {
   PB_5,  //D11
   PB_4,  //D12
   PB_3,  //D13 - LED
-  PA_0,  //D14//A0
-  PA_1,  //D15//A1
-  PA_3,  //D16//A2
-  PA_4,  //D17//A3
-  PA_5,  //D18//A4
-  PA_6,  //D19//A5
-  PA_7,  //D20//A6
-  PA_2,  //D21 - STLink Tx (no A7)
+  PA_0,  //D14/A0
+  PA_1,  //D15/A1
+  PA_3,  //D16/A2
+  PA_4,  //D17/A3
+  PA_5,  //D18/A4
+  PA_6,  //D19/A5
+  PA_7,  //D20/A6
+  PA_2,  //D21/A7 - STLink Tx
   PA_15  //D22 - STLink Rx
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  14, // A0
+  15, // A1
+  16, // A2
+  17, // A3
+  18, // A4
+  19, // A5
+  20, // A6
+  21  // A7
+};
+
 #ifdef __cplusplus
 }
 #endif