Browse Source

Pins debugging AVR serial pins (#16437)

ellensp 4 years ago
parent
commit
d7aee3b7b6
1 changed files with 79 additions and 7 deletions
  1. 79
    7
      Marlin/src/pins/pinsDebug.h

+ 79
- 7
Marlin/src/pins/pinsDebug.h View File

@@ -45,9 +45,35 @@
45 45
 #line 46
46 46
 
47 47
 // manually add pins that have names that are macros which don't play well with these macros
48
-#if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM))
49
-  static const char RXD_NAME[] PROGMEM = { "RXD" };
50
-  static const char TXD_NAME[] PROGMEM = { "TXD" };
48
+#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM))
49
+  #if SERIAL_PORT == 0
50
+    static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
51
+    static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
52
+  #elif SERIAL_PORT == 1
53
+    static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
54
+    static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
55
+  #elif SERIAL_PORT == 2
56
+    static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
57
+    static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
58
+  #elif SERIAL_PORT == 3 
59
+    static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
60
+    static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
61
+  #endif
62
+  #ifdef SERIAL_PORT_2
63
+    #if SERIAL_PORT_2 == 0
64
+      static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
65
+      static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
66
+    #elif SERIAL_PORT_2 == 1
67
+      static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
68
+      static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
69
+    #elif SERIAL_PORT_2 == 2
70
+      static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
71
+      static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
72
+    #elif SERIAL_PORT_2 == 3
73
+      static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
74
+      static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
75
+    #endif
76
+  #endif
51 77
 #endif
52 78
 
53 79
 /////////////////////////////////////////////////////////////////////////////
@@ -85,11 +111,57 @@ const PinInfo pin_array[] PROGMEM = {
85 111
   // manually add pins ...
86 112
   #if SERIAL_PORT == 0
87 113
     #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
88
-      { RXD_NAME, 0, true },
89
-      { TXD_NAME, 1, true },
114
+      { RXD_NAME_0, 0, true },
115
+      { TXD_NAME_0, 1, true },
116
+    #elif AVR_ATmega1284_FAMILY
117
+      { RXD_NAME_0, 8, true },
118
+      { TXD_NAME_0, 9, true },
119
+    #endif
120
+  #elif SERIAL_PORT == 1
121
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
122
+      { RXD_NAME_1, 19, true },
123
+      { TXD_NAME_1, 18, true },
90 124
     #elif AVR_ATmega1284_FAMILY
91
-      { RXD_NAME, 8, true },
92
-      { TXD_NAME, 9, true },
125
+      { RXD_NAME_1, 10, true },
126
+      { TXD_NAME_1, 11, true },
127
+    #endif
128
+  #elif SERIAL_PORT == 2
129
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
130
+      { RXD_NAME_2, 17, true },
131
+      { TXD_NAME_2, 16, true },
132
+    #endif
133
+  #elif SERIAL_PORT == 3
134
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
135
+      { RXD_NAME_3, 15, true },
136
+      { TXD_NAME_3, 14, true },
137
+    #endif
138
+  #endif
139
+
140
+  #if SERIAL_PORT_2 == 0
141
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
142
+      { RXD_NAME_0, 0, true },
143
+      { TXD_NAME_0, 1, true },
144
+    #elif AVR_ATmega1284_FAMILY
145
+      { RXD_NAME_0, 8, true },
146
+      { TXD_NAME_0, 9, true },
147
+    #endif
148
+  #elif SERIAL_PORT_2 == 1
149
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
150
+      { RXD_NAME_1, 19, true },
151
+      { TXD_NAME_1, 18, true },
152
+    #elif AVR_ATmega1284_FAMILY
153
+      { RXD_NAME_1, 10, true },
154
+      { TXD_NAME_1, 11, true },
155
+    #endif
156
+  #elif SERIAL_PORT_2 == 2
157
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
158
+      { RXD_NAME_2, 17, true },
159
+      { TXD_NAME_2, 16, true },
160
+    #endif
161
+  #elif SERIAL_PORT_2 == 3
162
+    #if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
163
+      { RXD_NAME_3, 15, true },
164
+      { TXD_NAME_3, 14, true },
93 165
     #endif
94 166
   #endif
95 167
 

Loading…
Cancel
Save