thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Reduce STM32_F4_F7 pin warnings

Scott Lahteine 6 years ago
parent
fb579212ea
commit
579e4396e2
1 changed files with 134 additions and 122 deletions
Split View Show Diff Stats
  1. 134
    122
      Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h

+ 134
- 122
Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h View File 

@@ -27,8 +27,6 @@
27 27 
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
28 28 
  */
29 29
30 
-#define _BV(b) (1 << (b))
31 
-
32 30 
 #define READ(IO)                digitalRead(IO)
33 31 
 #define WRITE(IO,V)             digitalWrite(IO,V)
34 32 
 
@@ -66,127 +64,141 @@
66 64
67 65 
 #define _STM32_PIN(P,PN) ((PORT##P * 16) + PN)
68 66
69 
-#define PA0  _STM32_PIN(A,  0)
70 
-#define PA1  _STM32_PIN(A,  1)
71 
-#define PA2  _STM32_PIN(A,  2)
72 
-#define PA3  _STM32_PIN(A,  3)
73 
-#define PA4  _STM32_PIN(A,  4)
74 
-#define PA5  _STM32_PIN(A,  5)
75 
-#define PA6  _STM32_PIN(A,  6)
76 
-#define PA7  _STM32_PIN(A,  7)
77 
-#define PA8  _STM32_PIN(A,  8)
78 
-#define PA9  _STM32_PIN(A,  9)
79 
-#define PA10 _STM32_PIN(A, 10)
80 
-#define PA11 _STM32_PIN(A, 11)
81 
-#define PA12 _STM32_PIN(A, 12)
82 
-#define PA13 _STM32_PIN(A, 13)
83 
-#define PA14 _STM32_PIN(A, 14)
84 
-#define PA15 _STM32_PIN(A, 15)
85 
-
86 
-#define PB0  _STM32_PIN(B,  0)
87 
-#define PB1  _STM32_PIN(B,  1)
88 
-#define PB2  _STM32_PIN(B,  2)
89 
-#define PB3  _STM32_PIN(B,  3)
90 
-#define PB4  _STM32_PIN(B,  4)
91 
-#define PB5  _STM32_PIN(B,  5)
92 
-#define PB6  _STM32_PIN(B,  6)
93 
-#define PB7  _STM32_PIN(B,  7)
94 
-#define PB8  _STM32_PIN(B,  8)
95 
-#define PB9  _STM32_PIN(B,  9)
96 
-#define PB10 _STM32_PIN(B, 10)
97 
-#define PB11 _STM32_PIN(B, 11)
98 
-#define PB12 _STM32_PIN(B, 12)
99 
-#define PB13 _STM32_PIN(B, 13)
100 
-#define PB14 _STM32_PIN(B, 14)
101 
-#define PB15 _STM32_PIN(B, 15)
102 
-
103 
-#define PC0  _STM32_PIN(C,  0)
104 
-#define PC1  _STM32_PIN(C,  1)
105 
-#define PC2  _STM32_PIN(C,  2)
106 
-#define PC3  _STM32_PIN(C,  3)
107 
-#define PC4  _STM32_PIN(C,  4)
108 
-#define PC5  _STM32_PIN(C,  5)
109 
-#define PC6  _STM32_PIN(C,  6)
110 
-#define PC7  _STM32_PIN(C,  7)
111 
-#define PC8  _STM32_PIN(C,  8)
112 
-#define PC9  _STM32_PIN(C,  9)
113 
-#define PC10 _STM32_PIN(C, 10)
114 
-#define PC11 _STM32_PIN(C, 11)
115 
-#define PC12 _STM32_PIN(C, 12)
116 
-#define PC13 _STM32_PIN(C, 13)
117 
-#define PC14 _STM32_PIN(C, 14)
118 
-#define PC15 _STM32_PIN(C, 15)
119 
-
120 
-#define PD0  _STM32_PIN(D,  0)
121 
-#define PD1  _STM32_PIN(D,  1)
122 
-#define PD2  _STM32_PIN(D,  2)
123 
-#define PD3  _STM32_PIN(D,  3)
124 
-#define PD4  _STM32_PIN(D,  4)
125 
-#define PD5  _STM32_PIN(D,  5)
126 
-#define PD6  _STM32_PIN(D,  6)
127 
-#define PD7  _STM32_PIN(D,  7)
128 
-#define PD8  _STM32_PIN(D,  8)
129 
-#define PD9  _STM32_PIN(D,  9)
130 
-#define PD10 _STM32_PIN(D, 10)
131 
-#define PD11 _STM32_PIN(D, 11)
132 
-#define PD12 _STM32_PIN(D, 12)
133 
-#define PD13 _STM32_PIN(D, 13)
134 
-#define PD14 _STM32_PIN(D, 14)
135 
-#define PD15 _STM32_PIN(D, 15)
136 
-
137 
-#define PE0  _STM32_PIN(E,  0)
138 
-#define PE1  _STM32_PIN(E,  1)
139 
-#define PE2  _STM32_PIN(E,  2)
140 
-#define PE3  _STM32_PIN(E,  3)
141 
-#define PE4  _STM32_PIN(E,  4)
142 
-#define PE5  _STM32_PIN(E,  5)
143 
-#define PE6  _STM32_PIN(E,  6)
144 
-#define PE7  _STM32_PIN(E,  7)
145 
-#define PE8  _STM32_PIN(E,  8)
146 
-#define PE9  _STM32_PIN(E,  9)
147 
-#define PE10 _STM32_PIN(E, 10)
148 
-#define PE11 _STM32_PIN(E, 11)
149 
-#define PE12 _STM32_PIN(E, 12)
150 
-#define PE13 _STM32_PIN(E, 13)
151 
-#define PE14 _STM32_PIN(E, 14)
152 
-#define PE15 _STM32_PIN(E, 15)
67 
+#ifndef PA0
68 
+  #define PA0  _STM32_PIN(A,  0)
69 
+  #define PA1  _STM32_PIN(A,  1)
70 
+  #define PA2  _STM32_PIN(A,  2)
71 
+  #define PA3  _STM32_PIN(A,  3)
72 
+  #define PA4  _STM32_PIN(A,  4)
73 
+  #define PA5  _STM32_PIN(A,  5)
74 
+  #define PA6  _STM32_PIN(A,  6)
75 
+  #define PA7  _STM32_PIN(A,  7)
76 
+  #define PA8  _STM32_PIN(A,  8)
77 
+  #define PA9  _STM32_PIN(A,  9)
78 
+  #define PA10 _STM32_PIN(A, 10)
79 
+  #define PA11 _STM32_PIN(A, 11)
80 
+  #define PA12 _STM32_PIN(A, 12)
81 
+  #define PA13 _STM32_PIN(A, 13)
82 
+  #define PA14 _STM32_PIN(A, 14)
83 
+  #define PA15 _STM32_PIN(A, 15)
84 
+#endif
85 
+
86 
+#ifndef PB0
87 
+  #define PB0  _STM32_PIN(B,  0)
88 
+  #define PB1  _STM32_PIN(B,  1)
89 
+  #define PB2  _STM32_PIN(B,  2)
90 
+  #define PB3  _STM32_PIN(B,  3)
91 
+  #define PB4  _STM32_PIN(B,  4)
92 
+  #define PB5  _STM32_PIN(B,  5)
93 
+  #define PB6  _STM32_PIN(B,  6)
94 
+  #define PB7  _STM32_PIN(B,  7)
95 
+  #define PB8  _STM32_PIN(B,  8)
96 
+  #define PB9  _STM32_PIN(B,  9)
97 
+  #define PB10 _STM32_PIN(B, 10)
98 
+  #define PB11 _STM32_PIN(B, 11)
99 
+  #define PB12 _STM32_PIN(B, 12)
100 
+  #define PB13 _STM32_PIN(B, 13)
101 
+  #define PB14 _STM32_PIN(B, 14)
102 
+  #define PB15 _STM32_PIN(B, 15)
103 
+#endif
104 
+
105 
+#ifndef PC0
106 
+  #define PC0  _STM32_PIN(C,  0)
107 
+  #define PC1  _STM32_PIN(C,  1)
108 
+  #define PC2  _STM32_PIN(C,  2)
109 
+  #define PC3  _STM32_PIN(C,  3)
110 
+  #define PC4  _STM32_PIN(C,  4)
111 
+  #define PC5  _STM32_PIN(C,  5)
112 
+  #define PC6  _STM32_PIN(C,  6)
113 
+  #define PC7  _STM32_PIN(C,  7)
114 
+  #define PC8  _STM32_PIN(C,  8)
115 
+  #define PC9  _STM32_PIN(C,  9)
116 
+  #define PC10 _STM32_PIN(C, 10)
117 
+  #define PC11 _STM32_PIN(C, 11)
118 
+  #define PC12 _STM32_PIN(C, 12)
119 
+  #define PC13 _STM32_PIN(C, 13)
120 
+  #define PC14 _STM32_PIN(C, 14)
121 
+  #define PC15 _STM32_PIN(C, 15)
122 
+#endif
123 
+
124 
+#ifndef PD0
125 
+  #define PD0  _STM32_PIN(D,  0)
126 
+  #define PD1  _STM32_PIN(D,  1)
127 
+  #define PD2  _STM32_PIN(D,  2)
128 
+  #define PD3  _STM32_PIN(D,  3)
129 
+  #define PD4  _STM32_PIN(D,  4)
130 
+  #define PD5  _STM32_PIN(D,  5)
131 
+  #define PD6  _STM32_PIN(D,  6)
132 
+  #define PD7  _STM32_PIN(D,  7)
133 
+  #define PD8  _STM32_PIN(D,  8)
134 
+  #define PD9  _STM32_PIN(D,  9)
135 
+  #define PD10 _STM32_PIN(D, 10)
136 
+  #define PD11 _STM32_PIN(D, 11)
137 
+  #define PD12 _STM32_PIN(D, 12)
138 
+  #define PD13 _STM32_PIN(D, 13)
139 
+  #define PD14 _STM32_PIN(D, 14)
140 
+  #define PD15 _STM32_PIN(D, 15)
141 
+#endif
142 
+
143 
+#ifndef PE0
144 
+  #define PE0  _STM32_PIN(E,  0)
145 
+  #define PE1  _STM32_PIN(E,  1)
146 
+  #define PE2  _STM32_PIN(E,  2)
147 
+  #define PE3  _STM32_PIN(E,  3)
148 
+  #define PE4  _STM32_PIN(E,  4)
149 
+  #define PE5  _STM32_PIN(E,  5)
150 
+  #define PE6  _STM32_PIN(E,  6)
151 
+  #define PE7  _STM32_PIN(E,  7)
152 
+  #define PE8  _STM32_PIN(E,  8)
153 
+  #define PE9  _STM32_PIN(E,  9)
154 
+  #define PE10 _STM32_PIN(E, 10)
155 
+  #define PE11 _STM32_PIN(E, 11)
156 
+  #define PE12 _STM32_PIN(E, 12)
157 
+  #define PE13 _STM32_PIN(E, 13)
158 
+  #define PE14 _STM32_PIN(E, 14)
159 
+  #define PE15 _STM32_PIN(E, 15)
160 
+#endif
153 161
154 162 
 #ifdef STM32F7
155 
-  #define PORTF 5
156 
-  #define PORTG 6
157 
-
158 
-  #define PF0  _STM32_PIN(F,  0)
159 
-  #define PF1  _STM32_PIN(F,  1)
160 
-  #define PF2  _STM32_PIN(F,  2)
161 
-  #define PF3  _STM32_PIN(F,  3)
162 
-  #define PF4  _STM32_PIN(F,  4)
163 
-  #define PF5  _STM32_PIN(F,  5)
164 
-  #define PF6  _STM32_PIN(F,  6)
165 
-  #define PF7  _STM32_PIN(F,  7)
166 
-  #define PF8  _STM32_PIN(F,  8)
167 
-  #define PF9  _STM32_PIN(F,  9)
168 
-  #define PF10 _STM32_PIN(F, 10)
169 
-  #define PF11 _STM32_PIN(F, 11)
170 
-  #define PF12 _STM32_PIN(F, 12)
171 
-  #define PF13 _STM32_PIN(F, 13)
172 
-  #define PF14 _STM32_PIN(F, 14)
173 
-  #define PF15 _STM32_PIN(F, 15)
174 
-
175 
-  #define PG0  _STM32_PIN(G,  0)
176 
-  #define PG1  _STM32_PIN(G,  1)
177 
-  #define PG2  _STM32_PIN(G,  2)
178 
-  #define PG3  _STM32_PIN(G,  3)
179 
-  #define PG4  _STM32_PIN(G,  4)
180 
-  #define PG5  _STM32_PIN(G,  5)
181 
-  #define PG6  _STM32_PIN(G,  6)
182 
-  #define PG7  _STM32_PIN(G,  7)
183 
-  #define PG8  _STM32_PIN(G,  8)
184 
-  #define PG9  _STM32_PIN(G,  9)
185 
-  #define PG10 _STM32_PIN(G, 10)
186 
-  #define PG11 _STM32_PIN(G, 11)
187 
-  #define PG12 _STM32_PIN(G, 12)
188 
-  #define PG13 _STM32_PIN(G, 13)
189 
-  #define PG14 _STM32_PIN(G, 14)
190 
-  #define PG15 _STM32_PIN(G, 15)
163 
+
164 
+  #ifndef PF0
165 
+    #define PORTF 5
166 
+    #define PF0  _STM32_PIN(F,  0)
167 
+    #define PF1  _STM32_PIN(F,  1)
168 
+    #define PF2  _STM32_PIN(F,  2)
169 
+    #define PF3  _STM32_PIN(F,  3)
170 
+    #define PF4  _STM32_PIN(F,  4)
171 
+    #define PF5  _STM32_PIN(F,  5)
172 
+    #define PF6  _STM32_PIN(F,  6)
173 
+    #define PF7  _STM32_PIN(F,  7)
174 
+    #define PF8  _STM32_PIN(F,  8)
175 
+    #define PF9  _STM32_PIN(F,  9)
176 
+    #define PF10 _STM32_PIN(F, 10)
177 
+    #define PF11 _STM32_PIN(F, 11)
178 
+    #define PF12 _STM32_PIN(F, 12)
179 
+    #define PF13 _STM32_PIN(F, 13)
180 
+    #define PF14 _STM32_PIN(F, 14)
181 
+    #define PF15 _STM32_PIN(F, 15)
182 
+  #endif
183 
+
184 
+  #ifndef PG0
185 
+    #define PORTG 6
186 
+    #define PG0  _STM32_PIN(G,  0)
187 
+    #define PG1  _STM32_PIN(G,  1)
188 
+    #define PG2  _STM32_PIN(G,  2)
189 
+    #define PG3  _STM32_PIN(G,  3)
190 
+    #define PG4  _STM32_PIN(G,  4)
191 
+    #define PG5  _STM32_PIN(G,  5)
192 
+    #define PG6  _STM32_PIN(G,  6)
193 
+    #define PG7  _STM32_PIN(G,  7)
194 
+    #define PG8  _STM32_PIN(G,  8)
195 
+    #define PG9  _STM32_PIN(G,  9)
196 
+    #define PG10 _STM32_PIN(G, 10)
197 
+    #define PG11 _STM32_PIN(G, 11)
198 
+    #define PG12 _STM32_PIN(G, 12)
199 
+    #define PG13 _STM32_PIN(G, 13)
200 
+    #define PG14 _STM32_PIN(G, 14)
201 
+    #define PG15 _STM32_PIN(G, 15)
202 
+  #endif
191 203
192 204 
 #endif // STM32GENERIC && STM32F7

Write Preview
Loading…
Cancel
Save