Initialize DaisySeed::seedgpio using constexpr pins from header

electro-smith · Feb 28, 2024 · 2830cee · 2830cee
1 parent eb3b268
commit 2830cee
Showing 1 changed file with 33 additions and 33 deletions.
diff --git a/src/daisy_seed.cpp b/src/daisy_seed.cpp
@@ -12,44 +12,44 @@ constexpr uint8_t  SEED_TEST_POINT_PIN  = 14;
 const Pin seedgpio[33] = {
     // GPIO 1-8
     //{PORTA, 8}, // removed on Rev4
-    Pin(PORTB, 12),
-    Pin(PORTC, 11),
-    Pin(PORTC, 10),
-    Pin(PORTC, 9),
-    Pin(PORTC, 8),
-    Pin(PORTD, 2),
-    Pin(PORTC, 12),
+    seed::D0,
+    seed::D1,
+    seed::D2,
+    seed::D3,
+    seed::D4,
+    seed::D5,
+    seed::D6,
     // GPIO 9-16
-    Pin(PORTG, 10),
-    Pin(PORTG, 11),
-    Pin(PORTB, 4),
-    Pin(PORTB, 5),
-    Pin(PORTB, 8),
-    Pin(PORTB, 9),
-    Pin(PORTB, 6),
-    Pin(PORTB, 7),
+    seed::D7,
+    seed::D8,
+    seed::D9,
+    seed::D10,
+    seed::D11,
+    seed::D12,
+    seed::D13,
+    seed::D14,
     // GPIO 17-24
-    Pin(PORTC, 0),
-    Pin(PORTA, 3),
-    Pin(PORTB, 1),
-    Pin(PORTA, 7),
-    Pin(PORTA, 6),
-    Pin(PORTC, 1),
-    Pin(PORTC, 4),
-    Pin(PORTA, 5),
+    seed::D15,
+    seed::D16,
+    seed::D17,
+    seed::D18,
+    seed::D19,
+    seed::D20,
+    seed::D21,
+    seed::D22,
     // GPIO 25-31
-    Pin(PORTA, 4),
-    Pin(PORTA, 1),
-    Pin(PORTA, 0),
-    Pin(PORTD, 11),
-    Pin(PORTG, 9),
-    Pin(PORTA, 2),
-    Pin(PORTB, 14),
-    Pin(PORTB, 15),
+    seed::D23,
+    seed::D24,
+    seed::D25,
+    seed::D26,
+    seed::D27,
+    seed::D28,
+    seed::D29,
+    seed::D30,
 
     // Seed2DFM exclusive pins
-    Pin(PORTC, 2),
-    Pin(PORTC, 3),
+    seed::D31,
+    seed::D32,
 };
 #else
 const GPIOPort seed_ports[32] = {