From bc4af3fbb8a56c3e5a951e9839a0001db7a9640c Mon Sep 17 00:00:00 2001
From: Mike S <CyberMerln@gmail.com>
Date: Mon, 17 Jul 2023 15:52:42 -0400
Subject: [PATCH 1/5] update for digital pin definitions

---
 variants/MINIMA/pins_arduino.h    | 34 +++++++++++++++----------------
 variants/UNOWIFIR4/pins_arduino.h | 34 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index d63bb7410..bf5fb8499 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -35,8 +35,6 @@ static const uint8_t A3 = PIN_A3;
 static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 
-// Digital pins
-// -----------
 #undef D0
 #undef D1
 #undef D2
@@ -53,22 +51,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-#define D0  (0u)
-#define D1  (1u)
-#define D2  (2u)
-#define D3  (3u)
-#define D4  (4u)
-#define D5  (5u)
-#define D6  (6u)
-#define D7  (7u)
-#define D8  (8u)
-#define D9  (9u)
-#define D10 (10u)
-#define D11 (11u)
-#define D12 (12u)
-#define D13 (13u)
-#define D14 (14u)
-#define D15 (15u)
+static const uint8_t D0 = PIN_D0;
+static const uint8_t D1 = PIN_D1;
+static const uint8_t D2 = PIN_D2;
+static const uint8_t D3 = PIN_D3;
+static const uint8_t D4 = PIN_D4;
+static const uint8_t D5 = PIN_D5;
+static const uint8_t D6 = PIN_D6;
+static const uint8_t D7 = PIN_D7;
+static const uint8_t D8 = PIN_D8;
+static const uint8_t D9 = PIN_D9;
+static const uint8_t D10 = PIN_D10;
+static const uint8_t D11 = PIN_D11;
+static const uint8_t D12 = PIN_D12;
+static const uint8_t D13 = PIN_D13;
+static const uint8_t D14 = PIN_D14;
+static const uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index 3f79c87cb..0ef985129 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -35,8 +35,6 @@ static const uint8_t A3 = PIN_A3;
 static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 
-// Digital pins
-// -----------
 #undef D0
 #undef D1
 #undef D2
@@ -53,22 +51,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-#define D0  (0u)
-#define D1  (1u)
-#define D2  (2u)
-#define D3  (3u)
-#define D4  (4u)
-#define D5  (5u)
-#define D6  (6u)
-#define D7  (7u)
-#define D8  (8u)
-#define D9  (9u)
-#define D10 (10u)
-#define D11 (11u)
-#define D12 (12u)
-#define D13 (13u)
-#define D14 (14u)
-#define D15 (15u)
+static const uint8_t D0 = PIN_D0;
+static const uint8_t D1 = PIN_D1;
+static const uint8_t D2 = PIN_D2;
+static const uint8_t D3 = PIN_D3;
+static const uint8_t D4 = PIN_D4;
+static const uint8_t D5 = PIN_D5;
+static const uint8_t D6 = PIN_D6;
+static const uint8_t D7 = PIN_D7;
+static const uint8_t D8 = PIN_D8;
+static const uint8_t D9 = PIN_D9;
+static const uint8_t D10 = PIN_D10;
+static const uint8_t D11 = PIN_D11;
+static const uint8_t D12 = PIN_D12;
+static const uint8_t D13 = PIN_D13;
+static const uint8_t D14 = PIN_D14;
+static const uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----

From aab4d37070b4ce8fb15eee73eee36c2e39365d15 Mon Sep 17 00:00:00 2001
From: Mike S <CyberMerln@gmail.com>
Date: Tue, 18 Jul 2023 07:07:40 -0400
Subject: [PATCH 2/5] changed const to constexpr

---
 variants/MINIMA/pins_arduino.h    | 32 +++++++++++++++----------------
 variants/UNOWIFIR4/pins_arduino.h | 32 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index bf5fb8499..7751b108d 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -51,22 +51,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-static const uint8_t D0 = PIN_D0;
-static const uint8_t D1 = PIN_D1;
-static const uint8_t D2 = PIN_D2;
-static const uint8_t D3 = PIN_D3;
-static const uint8_t D4 = PIN_D4;
-static const uint8_t D5 = PIN_D5;
-static const uint8_t D6 = PIN_D6;
-static const uint8_t D7 = PIN_D7;
-static const uint8_t D8 = PIN_D8;
-static const uint8_t D9 = PIN_D9;
-static const uint8_t D10 = PIN_D10;
-static const uint8_t D11 = PIN_D11;
-static const uint8_t D12 = PIN_D12;
-static const uint8_t D13 = PIN_D13;
-static const uint8_t D14 = PIN_D14;
-static const uint8_t D15 = PIN_D15;
+static constexpr uint8_t D0 = PIN_D0;
+static constexpr uint8_t D1 = PIN_D1;
+static constexpr uint8_t D2 = PIN_D2;
+static constexpr uint8_t D3 = PIN_D3;
+static constexpr uint8_t D4 = PIN_D4;
+static constexpr uint8_t D5 = PIN_D5;
+static constexpr uint8_t D6 = PIN_D6;
+static constexpr uint8_t D7 = PIN_D7;
+static constexpr uint8_t D8 = PIN_D8;
+static constexpr uint8_t D9 = PIN_D9;
+static constexpr uint8_t D10 = PIN_D10;
+static constexpr uint8_t D11 = PIN_D11;
+static constexpr uint8_t D12 = PIN_D12;
+static constexpr uint8_t D13 = PIN_D13;
+static constexpr uint8_t D14 = PIN_D14;
+static constexpr uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index 0ef985129..486c9dcaa 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -51,22 +51,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-static const uint8_t D0 = PIN_D0;
-static const uint8_t D1 = PIN_D1;
-static const uint8_t D2 = PIN_D2;
-static const uint8_t D3 = PIN_D3;
-static const uint8_t D4 = PIN_D4;
-static const uint8_t D5 = PIN_D5;
-static const uint8_t D6 = PIN_D6;
-static const uint8_t D7 = PIN_D7;
-static const uint8_t D8 = PIN_D8;
-static const uint8_t D9 = PIN_D9;
-static const uint8_t D10 = PIN_D10;
-static const uint8_t D11 = PIN_D11;
-static const uint8_t D12 = PIN_D12;
-static const uint8_t D13 = PIN_D13;
-static const uint8_t D14 = PIN_D14;
-static const uint8_t D15 = PIN_D15;
+static constexpr uint8_t D0 = PIN_D0;
+static constexpr uint8_t D1 = PIN_D1;
+static constexpr uint8_t D2 = PIN_D2;
+static constexpr uint8_t D3 = PIN_D3;
+static constexpr uint8_t D4 = PIN_D4;
+static constexpr uint8_t D5 = PIN_D5;
+static constexpr uint8_t D6 = PIN_D6;
+static constexpr uint8_t D7 = PIN_D7;
+static constexpr uint8_t D8 = PIN_D8;
+static constexpr uint8_t D9 = PIN_D9;
+static constexpr uint8_t D10 = PIN_D10;
+static constexpr uint8_t D11 = PIN_D11;
+static constexpr uint8_t D12 = PIN_D12;
+static constexpr uint8_t D13 = PIN_D13;
+static constexpr uint8_t D14 = PIN_D14;
+static constexpr uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----

From a3a846c82da655a72f9dfeaf5ccfbb34d4061ebf Mon Sep 17 00:00:00 2001
From: Mike S <CyberMerln@gmail.com>
Date: Tue, 18 Jul 2023 08:18:34 -0400
Subject: [PATCH 3/5] fix copy and paste error

---
 variants/MINIMA/pins_arduino.h    | 19 +++++++++++++++++++
 variants/UNOWIFIR4/pins_arduino.h | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index 7751b108d..cfbf6e876 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -35,6 +35,25 @@ static const uint8_t A3 = PIN_A3;
 static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 
+// Digital pins
+// -----------
+#define PIN_D0   (0u)
+#define PIN_D1   (1u)
+#define PIN_D2   (2u)
+#define PIN_D3   (3u)
+#define PIN_D4   (4u)
+#define PIN_D5   (5u)
+#define PIN_D6   (6u)
+#define PIN_D7   (7u)
+#define PIN_D8   (8u)
+#define PIN_D9   (9u)
+#define PIN_D10   (10u)
+#define PIN_D11   (11u)
+#define PIN_D12   (12u)
+#define PIN_D13   (13u)
+#define PIN_D14   (14u)
+#define PIN_D15   (15u)
+
 #undef D0
 #undef D1
 #undef D2
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index 486c9dcaa..f431d453a 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -35,6 +35,25 @@ static const uint8_t A3 = PIN_A3;
 static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 
+// Digital pins
+// -----------
+#define PIN_D0   (0u)
+#define PIN_D1   (1u)
+#define PIN_D2   (2u)
+#define PIN_D3   (3u)
+#define PIN_D4   (4u)
+#define PIN_D5   (5u)
+#define PIN_D6   (6u)
+#define PIN_D7   (7u)
+#define PIN_D8   (8u)
+#define PIN_D9   (9u)
+#define PIN_D10   (10u)
+#define PIN_D11   (11u)
+#define PIN_D12   (12u)
+#define PIN_D13   (13u)
+#define PIN_D14   (14u)
+#define PIN_D15   (15u)
+
 #undef D0
 #undef D1
 #undef D2

From 1690d2b7b21961878fedb55e9236942bdad382e7 Mon Sep 17 00:00:00 2001
From: Mike S <CyberMerln@gmail.com>
Date: Tue, 18 Jul 2023 11:33:58 -0400
Subject: [PATCH 4/5] Updated PR for C33

---
 variants/PORTENTA_C33/pins_arduino.h | 33 +++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/variants/PORTENTA_C33/pins_arduino.h b/variants/PORTENTA_C33/pins_arduino.h
index 189a14f82..945a7f1d9 100644
--- a/variants/PORTENTA_C33/pins_arduino.h
+++ b/variants/PORTENTA_C33/pins_arduino.h
@@ -46,14 +46,31 @@ static const uint8_t A7 = PIN_A7;
 
 // Digital pins
 // -----------
-#define D0  (0u)
-#define D1  (1u)
-#define D2  (2u)
-#define D3  (3u)
-#define D4  (4u)
-#define D5  (5u)
-#define D6  (6u)
-#define D7  (7u)
+#define PIN_D0   (0u)
+#define PIN_D1   (1u)
+#define PIN_D2   (2u)
+#define PIN_D3   (3u)
+#define PIN_D4   (4u)
+#define PIN_D5   (5u)
+#define PIN_D6   (6u)
+#define PIN_D7   (7u)
+
+#undef D0
+#undef D1
+#undef D2
+#undef D3
+#undef D4
+#undef D5
+#undef D6
+#undef D7
+static constexpr uint8_t D0 = PIN_D0;
+static constexpr uint8_t D1 = PIN_D1;
+static constexpr uint8_t D2 = PIN_D2;
+static constexpr uint8_t D3 = PIN_D3;
+static constexpr uint8_t D4 = PIN_D4;
+static constexpr uint8_t D5 = PIN_D5;
+static constexpr uint8_t D6 = PIN_D6;
+static constexpr uint8_t D7 = PIN_D7;
 
 // LEDs
 // ----

From 9756822e6d5f0ec0b702f72f81651842d966861e Mon Sep 17 00:00:00 2001
From: Mike S <CyberMerln@gmail.com>
Date: Mon, 24 Jul 2023 06:54:27 -0400
Subject: [PATCH 5/5] Reverted to the use of const

---
 variants/MINIMA/pins_arduino.h       | 32 ++++++++++++++--------------
 variants/PORTENTA_C33/pins_arduino.h | 16 +++++++-------
 variants/UNOWIFIR4/pins_arduino.h    | 32 ++++++++++++++--------------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/variants/MINIMA/pins_arduino.h b/variants/MINIMA/pins_arduino.h
index cfbf6e876..98dba5929 100644
--- a/variants/MINIMA/pins_arduino.h
+++ b/variants/MINIMA/pins_arduino.h
@@ -70,22 +70,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-static constexpr uint8_t D0 = PIN_D0;
-static constexpr uint8_t D1 = PIN_D1;
-static constexpr uint8_t D2 = PIN_D2;
-static constexpr uint8_t D3 = PIN_D3;
-static constexpr uint8_t D4 = PIN_D4;
-static constexpr uint8_t D5 = PIN_D5;
-static constexpr uint8_t D6 = PIN_D6;
-static constexpr uint8_t D7 = PIN_D7;
-static constexpr uint8_t D8 = PIN_D8;
-static constexpr uint8_t D9 = PIN_D9;
-static constexpr uint8_t D10 = PIN_D10;
-static constexpr uint8_t D11 = PIN_D11;
-static constexpr uint8_t D12 = PIN_D12;
-static constexpr uint8_t D13 = PIN_D13;
-static constexpr uint8_t D14 = PIN_D14;
-static constexpr uint8_t D15 = PIN_D15;
+static const uint8_t D0 = PIN_D0;
+static const uint8_t D1 = PIN_D1;
+static const uint8_t D2 = PIN_D2;
+static const uint8_t D3 = PIN_D3;
+static const uint8_t D4 = PIN_D4;
+static const uint8_t D5 = PIN_D5;
+static const uint8_t D6 = PIN_D6;
+static const uint8_t D7 = PIN_D7;
+static const uint8_t D8 = PIN_D8;
+static const uint8_t D9 = PIN_D9;
+static const uint8_t D10 = PIN_D10;
+static const uint8_t D11 = PIN_D11;
+static const uint8_t D12 = PIN_D12;
+static const uint8_t D13 = PIN_D13;
+static const uint8_t D14 = PIN_D14;
+static const uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----
diff --git a/variants/PORTENTA_C33/pins_arduino.h b/variants/PORTENTA_C33/pins_arduino.h
index 945a7f1d9..2b8b3d6d5 100644
--- a/variants/PORTENTA_C33/pins_arduino.h
+++ b/variants/PORTENTA_C33/pins_arduino.h
@@ -63,14 +63,14 @@ static const uint8_t A7 = PIN_A7;
 #undef D5
 #undef D6
 #undef D7
-static constexpr uint8_t D0 = PIN_D0;
-static constexpr uint8_t D1 = PIN_D1;
-static constexpr uint8_t D2 = PIN_D2;
-static constexpr uint8_t D3 = PIN_D3;
-static constexpr uint8_t D4 = PIN_D4;
-static constexpr uint8_t D5 = PIN_D5;
-static constexpr uint8_t D6 = PIN_D6;
-static constexpr uint8_t D7 = PIN_D7;
+static const uint8_t D0 = PIN_D0;
+static const uint8_t D1 = PIN_D1;
+static const uint8_t D2 = PIN_D2;
+static const uint8_t D3 = PIN_D3;
+static const uint8_t D4 = PIN_D4;
+static const uint8_t D5 = PIN_D5;
+static const uint8_t D6 = PIN_D6;
+static const uint8_t D7 = PIN_D7;
 
 // LEDs
 // ----
diff --git a/variants/UNOWIFIR4/pins_arduino.h b/variants/UNOWIFIR4/pins_arduino.h
index f431d453a..dc5fb93f8 100644
--- a/variants/UNOWIFIR4/pins_arduino.h
+++ b/variants/UNOWIFIR4/pins_arduino.h
@@ -70,22 +70,22 @@ static const uint8_t A5 = PIN_A5;
 #undef D13
 #undef D14
 #undef D15
-static constexpr uint8_t D0 = PIN_D0;
-static constexpr uint8_t D1 = PIN_D1;
-static constexpr uint8_t D2 = PIN_D2;
-static constexpr uint8_t D3 = PIN_D3;
-static constexpr uint8_t D4 = PIN_D4;
-static constexpr uint8_t D5 = PIN_D5;
-static constexpr uint8_t D6 = PIN_D6;
-static constexpr uint8_t D7 = PIN_D7;
-static constexpr uint8_t D8 = PIN_D8;
-static constexpr uint8_t D9 = PIN_D9;
-static constexpr uint8_t D10 = PIN_D10;
-static constexpr uint8_t D11 = PIN_D11;
-static constexpr uint8_t D12 = PIN_D12;
-static constexpr uint8_t D13 = PIN_D13;
-static constexpr uint8_t D14 = PIN_D14;
-static constexpr uint8_t D15 = PIN_D15;
+static const uint8_t D0 = PIN_D0;
+static const uint8_t D1 = PIN_D1;
+static const uint8_t D2 = PIN_D2;
+static const uint8_t D3 = PIN_D3;
+static const uint8_t D4 = PIN_D4;
+static const uint8_t D5 = PIN_D5;
+static const uint8_t D6 = PIN_D6;
+static const uint8_t D7 = PIN_D7;
+static const uint8_t D8 = PIN_D8;
+static const uint8_t D9 = PIN_D9;
+static const uint8_t D10 = PIN_D10;
+static const uint8_t D11 = PIN_D11;
+static const uint8_t D12 = PIN_D12;
+static const uint8_t D13 = PIN_D13;
+static const uint8_t D14 = PIN_D14;
+static const uint8_t D15 = PIN_D15;
 
 // LEDs
 // ----