From a584d10321e28ecdae0396701db4a66efb61c290 Mon Sep 17 00:00:00 2001
From: AcThPaU <31486033+AcThPaU@users.noreply.github.com>
Date: Sat, 13 Jul 2024 05:41:06 +0800
Subject: [PATCH] Fix D pin mapping on Adafruit IB/Feather RP2040 (#2259)

* Fix D pins on Adafruit IB RP2040
* Fix Adafruit Feather D pins mapping as well
* Change common.h to accept D pin def per board
---
 variants/adafruit_feather/pins_arduino.h   |   5 +
 variants/adafruit_itsybitsy/pins_arduino.h |  12 +++
 variants/generic/common.h                  | 120 +++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/variants/adafruit_feather/pins_arduino.h b/variants/adafruit_feather/pins_arduino.h
index 2f3726f..8e7163e 100644
--- a/variants/adafruit_feather/pins_arduino.h
+++ b/variants/adafruit_feather/pins_arduino.h
@@ -41,4 +41,9 @@
 #define SPI_HOWMANY    (1u)
 #define WIRE_HOWMANY   (1u)
 
+// D pins
+#define __PIN_D4             (6u)
+#define __PIN_D5             (7u)
+#define __PIN_D6             (8u)
+
 #include "../generic/common.h"
diff --git a/variants/adafruit_itsybitsy/pins_arduino.h b/variants/adafruit_itsybitsy/pins_arduino.h
index 5d51d12..442024d 100644
--- a/variants/adafruit_itsybitsy/pins_arduino.h
+++ b/variants/adafruit_itsybitsy/pins_arduino.h
@@ -40,4 +40,16 @@
 #define SPI_HOWMANY    (1u)
 #define WIRE_HOWMANY   (2u)
 
+// D pins
+#define __PIN_D2             (12u)
+#define __PIN_D3             (5u)
+#define __PIN_D4             (4u)
+#define __PIN_D5             (14u)
+#define __PIN_D7             (6u)
+#define __PIN_D9             (7u)
+#define __PIN_D10            (8u)
+#define __PIN_D11            (9u)
+#define __PIN_D12            (10u)
+#define __PIN_D13            (11u)
+
 #include "../generic/common.h"
diff --git a/variants/generic/common.h b/variants/generic/common.h
index ffcf3e6..5890c5e 100644
--- a/variants/generic/common.h
+++ b/variants/generic/common.h
@@ -13,36 +13,156 @@
 #define LED_BUILTIN PIN_LED
 #endif
 
+#ifdef __PIN_D0
+static const uint8_t D0 = __PIN_D0;
+#else
 static const uint8_t D0 = (0u);
+#endif
+#ifdef __PIN_D1
+static const uint8_t D1 = __PIN_D1;
+#else
 static const uint8_t D1 = (1u);
+#endif
+#ifdef __PIN_D2
+static const uint8_t D2 = __PIN_D2;
+#else
 static const uint8_t D2 = (2u);
+#endif
+#ifdef __PIN_D3
+static const uint8_t D3 = __PIN_D3;
+#else
 static const uint8_t D3 = (3u);
+#endif
+#ifdef __PIN_D4
+static const uint8_t D4 = __PIN_D4;
+#else
 static const uint8_t D4 = (4u);
+#endif
+#ifdef __PIN_D5
+static const uint8_t D5 = __PIN_D5;
+#else
 static const uint8_t D5 = (5u);
+#endif
+#ifdef __PIN_D6
+static const uint8_t D6 = __PIN_D6;
+#else
 static const uint8_t D6 = (6u);
+#endif
+#ifdef __PIN_D7
+static const uint8_t D7 = __PIN_D7;
+#else
 static const uint8_t D7 = (7u);
+#endif
+#ifdef __PIN_D8
+static const uint8_t D8 = __PIN_D8;
+#else
 static const uint8_t D8 = (8u);
+#endif
+#ifdef __PIN_D9
+static const uint8_t D9 = __PIN_D9;
+#else
 static const uint8_t D9 = (9u);
+#endif
+#ifdef __PIN_D10
+static const uint8_t D10 = __PIN_D10;
+#else
 static const uint8_t D10 = (10u);
+#endif
+#ifdef __PIN_D11
+static const uint8_t D11 = __PIN_D11;
+#else
 static const uint8_t D11 = (11u);
+#endif
+#ifdef __PIN_D12
+static const uint8_t D12 = __PIN_D12;
+#else
 static const uint8_t D12 = (12u);
+#endif
+#ifdef __PIN_D13
+static const uint8_t D13 = __PIN_D13;
+#else
 static const uint8_t D13 = (13u);
+#endif
+#ifdef __PIN_D14
+static const uint8_t D14 = __PIN_D14;
+#else
 static const uint8_t D14 = (14u);
+#endif
+#ifdef __PIN_D15
+static const uint8_t D15 = __PIN_D15;
+#else
 static const uint8_t D15 = (15u);
+#endif
+#ifdef __PIN_D16
+static const uint8_t D16 = __PIN_D16;
+#else
 static const uint8_t D16 = (16u);
+#endif
+#ifdef __PIN_D17
+static const uint8_t D17 = __PIN_D17;
+#else
 static const uint8_t D17 = (17u);
+#endif
+#ifdef __PIN_D18
+static const uint8_t D18 = __PIN_D18;
+#else
 static const uint8_t D18 = (18u);
+#endif
+#ifdef __PIN_D19
+static const uint8_t D19 = __PIN_D19;
+#else
 static const uint8_t D19 = (19u);
+#endif
+#ifdef __PIN_D20
+static const uint8_t D20 = __PIN_D20;
+#else
 static const uint8_t D20 = (20u);
+#endif
+#ifdef __PIN_D21
+static const uint8_t D21 = __PIN_D21;
+#else
 static const uint8_t D21 = (21u);
+#endif
+#ifdef __PIN_D22
+static const uint8_t D22 = __PIN_D22;
+#else
 static const uint8_t D22 = (22u);
+#endif
+#ifdef __PIN_D23
+static const uint8_t D23 = __PIN_D23;
+#else
 static const uint8_t D23 = (23u);
+#endif
+#ifdef __PIN_D24
+static const uint8_t D24 = __PIN_D24;
+#else
 static const uint8_t D24 = (24u);
+#endif
+#ifdef __PIN_D25
+static const uint8_t D25 = __PIN_D25;
+#else
 static const uint8_t D25 = (25u);
+#endif
+#ifdef __PIN_D26
+static const uint8_t D26 = __PIN_D26;
+#else
 static const uint8_t D26 = (26u);
+#endif
+#ifdef __PIN_D27
+static const uint8_t D27 = __PIN_D27;
+#else
 static const uint8_t D27 = (27u);
+#endif
+#ifdef __PIN_D28
+static const uint8_t D28 = __PIN_D28;
+#else
 static const uint8_t D28 = (28u);
+#endif
+#ifdef __PIN_D29
+static const uint8_t D29 = __PIN_D29;
+#else
 static const uint8_t D29 = (29u);
+#endif
 
 #ifdef __PIN_A0
 static const uint8_t A0 = __PIN_A0;