Rename analogInPin to analogInputPin

fpistm · fpistm · commit 2d9c20693d7e · 2019-12-20T09:41:51.000+01:00
Some example use analogInPin as variable name.

Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/pins_arduino.c b/cores/arduino/pins_arduino.c
@@ -75,7 +75,7 @@ bool pinIsAnalogInput(uint32_t pin)
   ret = (pin >= A0) && (pin < (A0 + NUM_ANALOG_INPUTS));
 #else
   for (uint32_t i = 0; i < NUM_ANALOG_INPUTS; i++) {
-    if (analogInPin[i] == pin) {
+    if (analogInputPin[i] == pin) {
       ret = true;
       break;
     }
@@ -93,7 +93,7 @@ uint32_t digitalPinToAnalogInput(uint32_t pin)
   ret = pin - A0;
 #else
   for (uint32_t i = 0; i < NUM_ANALOG_INPUTS; i++) {
-    if (analogInPin[i] == pin) {
+    if (analogInputPin[i] == pin) {
       ret = i;
       break;
     }
diff --git a/cores/arduino/pins_arduino.h b/cores/arduino/pins_arduino.h
@@ -59,7 +59,7 @@ enum {
 
 // If NUM_ANALOG_FIRST is not defined:
 // - Ax are not contiguous in the digitalPin array
-// - analogInPin array is available
+// - 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)
@@ -239,7 +239,7 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 extern "C" {
 #endif
 extern const PinName digitalPin[];
-extern const uint32_t analogInPin[];
+extern const uint32_t analogInputPin[];
 
 #define NOT_AN_INTERRUPT            NC // -1
 
@@ -250,7 +250,7 @@ extern const uint32_t analogInPin[];
 #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[analogInPin[p-NUM_ANALOG_FIRST]] : NC)
+                                                digitalPin[analogInputPin[p-NUM_ANALOG_FIRST]] : NC)
 #endif
 // Convert a PinName PX_n to a digital pin number
 uint32_t pinNametoDigitalPin(PinName p);
@@ -264,9 +264,9 @@ uint32_t pinNametoDigitalPin(PinName p);
 #else
 // For non contiguous analog pins definition in digitalPin array
 #define analogInputToDigitalPin(p)  ( \
-            ((uint32_t)p < NUM_ANALOG_INPUTS) ? analogInPin[p] : \
+            ((uint32_t)p < NUM_ANALOG_INPUTS) ? analogInputPin[p] : \
             ((uint32_t)p >= NUM_ANALOG_FIRST) && ((uint32_t)p <= NUM_ANALOG_LAST) ? \
-                                                analogInPin[p-NUM_ANALOG_FIRST] : p)
+                                                analogInputPin[p-NUM_ANALOG_FIRST] : p)
 #endif // !NUM_ANALOG_LAST
 #else
 // No analog pin defined
diff --git a/variants/BLUE_F407VE_Mini/variant.cpp b/variants/BLUE_F407VE_Mini/variant.cpp
@@ -135,7 +135,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   7,  //A0
   8,  //A1
   49, //A2
diff --git a/variants/DEMO_F030F4/variant.cpp b/variants/DEMO_F030F4/variant.cpp
@@ -60,7 +60,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   0, //A0
   1, //A1
   2, //A2
diff --git a/variants/DISCO_F030R8/variant.cpp b/variants/DISCO_F030R8/variant.cpp
@@ -96,7 +96,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   5,  //A0  = D5
   6,  //A1  = D6
   7,  //A2  = D7
diff --git a/variants/DISCO_F100RB/variant.cpp b/variants/DISCO_F100RB/variant.cpp
@@ -77,7 +77,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   1,  //A0
   2,  //A1
   3,  //A2
diff --git a/variants/DISCO_F407VG/variant.cpp b/variants/DISCO_F407VG/variant.cpp
@@ -110,7 +110,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   1,  //A0
   6,  //A1
   7,  //A2
diff --git a/variants/DISCO_L475VG_IOT/variant.cpp b/variants/DISCO_L475VG_IOT/variant.cpp
@@ -110,7 +110,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   69, //A0
   70, //A1
   71, //A2
diff --git a/variants/DIYMORE_F407VGT/variant.cpp b/variants/DIYMORE_F407VGT/variant.cpp
@@ -137,7 +137,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   8,  //A0
   11, //A1
   10, //A2
diff --git a/variants/FK407M1/variant.cpp b/variants/FK407M1/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   30, //A0
   32, //A1
   31, //A2
diff --git a/variants/Generic_F401Rx/variant.cpp b/variants/Generic_F401Rx/variant.cpp
@@ -81,7 +81,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   0,  // A0,  PA0
   1,  // A1,  PA1
   2,  // A2,  PA2
diff --git a/variants/HY_TinySTM103T/variant.cpp b/variants/HY_TinySTM103T/variant.cpp
@@ -70,7 +70,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   2,  //A0
   1,  //A1
   0,  //A2
diff --git a/variants/MAPLEMINI_F103CB/variant.cpp b/variants/MAPLEMINI_F103CB/variant.cpp
@@ -76,7 +76,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   3,  //A0
   4,  //A1
   5,  //A2
diff --git a/variants/NUCLEO_F030R8/variant.cpp b/variants/NUCLEO_F030R8/variant.cpp
@@ -87,7 +87,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   49, //A0
   50, //A1
   51, //A2
diff --git a/variants/NUCLEO_F091RC/variant.cpp b/variants/NUCLEO_F091RC/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F103RB/variant.cpp b/variants/NUCLEO_F103RB/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F207ZG/variant.cpp b/variants/NUCLEO_F207ZG/variant.cpp
@@ -136,7 +136,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   78, //A0
   79, //A1
   80, //A2
diff --git a/variants/NUCLEO_F302R8/variant.cpp b/variants/NUCLEO_F302R8/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F303RE/variant.cpp b/variants/NUCLEO_F303RE/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F401RE/variant.cpp b/variants/NUCLEO_F401RE/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F411RE/variant.cpp b/variants/NUCLEO_F411RE/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F429ZI/variant.cpp b/variants/NUCLEO_F429ZI/variant.cpp
@@ -117,7 +117,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   78, //A0
   79, //A1
   80, //A2
diff --git a/variants/NUCLEO_F446RE/variant.cpp b/variants/NUCLEO_F446RE/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_F767ZI/variant.cpp b/variants/NUCLEO_F767ZI/variant.cpp
@@ -115,7 +115,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   78, //A0
   79, //A1
   80, //A2
diff --git a/variants/NUCLEO_G071RB/variant.cpp b/variants/NUCLEO_G071RB/variant.cpp
@@ -91,7 +91,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   53, //A0
   54, //A1
   55, //A2
diff --git a/variants/NUCLEO_L053R8/variant.cpp b/variants/NUCLEO_L053R8/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_L073RZ/variant.cpp b/variants/NUCLEO_L073RZ/variant.cpp
@@ -96,7 +96,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_L152RE/variant.cpp b/variants/NUCLEO_L152RE/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_L452RE/variant.cpp b/variants/NUCLEO_L452RE/variant.cpp
@@ -142,7 +142,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   45, //A0
   46, //A1
   47, //A2
diff --git a/variants/NUCLEO_L476RG/variant.cpp b/variants/NUCLEO_L476RG/variant.cpp
@@ -84,7 +84,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   46, //A0
   47, //A1
   48, //A2
diff --git a/variants/NUCLEO_L496ZG/variant.cpp b/variants/NUCLEO_L496ZG/variant.cpp
@@ -168,7 +168,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   107, //A0
   108, //A1
   109, //A2
diff --git a/variants/NUCLEO_L4R5ZI/variant.cpp b/variants/NUCLEO_L4R5ZI/variant.cpp
@@ -166,7 +166,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   107, //A0
   108, //A1
   109, //A2
diff --git a/variants/RUMBA32_F446VE/variant.cpp b/variants/RUMBA32_F446VE/variant.cpp
@@ -107,7 +107,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   3,  //A0
   4,  //A1
   32, //A2
diff --git a/variants/VAKE_F446VE/variant.cpp b/variants/VAKE_F446VE/variant.cpp
@@ -111,7 +111,7 @@ const PinName digitalPin[] = {
 };
 
 // Analog (Ax) pin number array
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   0,  //A0
   1,  //A1
   82, //A2
diff --git a/variants/board_template/variant.cpp b/variants/board_template/variant.cpp
@@ -53,10 +53,10 @@ const PinName digitalPin[] = {
 };
 
 // If analog pins are not contiguous in the digitalPin array:
-// Add the analogInPin array without defining NUM_ANALOG_FIRST
+// Add the analogInputPin array without defining NUM_ANALOG_FIRST
 // Analog (Ax) pin number array
 // where x is the index to retrieve the digital pin number
-const uint32_t analogInPin[] = {
+const uint32_t analogInputPin[] = {
   //PXn, //Ax = Dx
   2, //A0 = Dx
   8, //A1 = Dy
diff --git a/variants/board_template/variant.h b/variants/board_template/variant.h
@@ -78,7 +78,7 @@ extern "C" {
 #define NUM_ANALOG_FIRST        0
 //------------------------------------OR------------------------------------------------------
 //   - If they are not contiguous in the digitalPin array:
-//     Add an analogInPin array in the variant.cpp without defining NUM_ANALOG_FIRST
+//     Add an analogInputPin array in the variant.cpp without defining NUM_ANALOG_FIRST
 //     In that case the defined PYn for analog pin have to define the Ax definition instead of
 //     index in digitalPin[] array:
 //     #define PA4  A14
