[stm32variant] Rename ND by PNUM_NOT_DEFINED

ND is used by some Arduino Library (ex: Ethernet)

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

CI/utils/stm32variant.py

@@ -1130,7 +1130,7 @@ def print_pinamevar():
 
 # Variant files generation
 def spi_pins_variant():
-    ss_pin = ss1_pin = ss2_pin = ss3_pin = mosi_pin = miso_pin = sck_pin = "ND"
+    ss_pin = ss1_pin = ss2_pin = ss3_pin = mosi_pin = miso_pin = sck_pin = "PNUM_NOT_DEFINED"
 
     # Iterate to find match instance if any
     for mosi in spimosi_list:
@@ -1155,13 +1155,13 @@ def spi_pins_variant():
         for ss in spissel_list:
             ss_inst = ss[2].split("_", 1)[0]
             if mosi_inst == ss_inst:
-                if "ND" == ss_pin:
+                if "PNUM_NOT_DEFINED" == ss_pin:
                     ss_pin = ss[0].replace("_", "", 1)
-                elif "ND" == ss1_pin:
+                elif "PNUM_NOT_DEFINED" == ss1_pin:
                     ss1_pin = ss[0].replace("_", "", 1)
-                elif "ND" == ss2_pin:
+                elif "PNUM_NOT_DEFINED" == ss2_pin:
                     ss2_pin = ss[0].replace("_", "", 1)
-                elif "ND" == ss3_pin:
+                elif "PNUM_NOT_DEFINED" == ss3_pin:
                     ss3_pin = ss[0].replace("_", "", 1)
                     break
         break
@@ -1179,7 +1179,7 @@ def spi_pins_variant():
 
 
 def i2c_pins_variant():
-    sda_pin = scl_pin = "ND"
+    sda_pin = scl_pin = "PNUM_NOT_DEFINED"
     # Iterate to find match instance if any
     for sda in i2csda_list:
         sda_inst = sda[2].split("_", 1)[0]
@@ -1229,7 +1229,7 @@ def serial_pins_variant():
             print("No serial instance number found!")
             serialnum = "-1"
     else:
-        serialtx_pin = serialtx_pin = "ND"
+        serialtx_pin = serialtx_pin = "PNUM_NOT_DEFINED"
         serialnum = "-1"
         print("No serial found!")
     return dict(instance=serialnum, rx=serialrx_pin, tx=serialtx_pin)

CI/utils/templates/variant_generic.h

@@ -37,12 +37,12 @@
 
 // On-board LED pin number
 #ifndef LED_BUILTIN
-  #define LED_BUILTIN           ND
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
 #endif
 
 // On-board user button
 #ifndef USER_BTN
-  #define USER_BTN              ND
+  #define USER_BTN              PNUM_NOT_DEFINED
 #endif
 
 // SPI definitions

cores/arduino/pins_arduino.h

@@ -32,7 +32,7 @@
 #define PNUM_MASK                   0xFF
 
 /* Pin not defined */
-#define ND                          NUM_DIGITAL_PINS
+#define PNUM_NOT_DEFINED            NUM_DIGITAL_PINS
 
 /* Avoid PortName issue */
 _Static_assert(LastPort <= 0x0F, "PortName must be less than 16");

keywords.txt

@@ -735,7 +735,7 @@ ALT5	LITERAL1
 ALT6	LITERAL1
 ALT7	LITERAL1
 ATLX_MASK	LITERAL1
-ND	LITERAL1
+PNUM_NOT_DEFINED	LITERAL1
 PNUM_MASK	LITERAL1
 PNUM_ANALOG_BASE	LITERAL1
 PNUM_ANALOG_INDEX	LITERAL1