Skip to content

Commit 1b1af65

Browse files
fpistmfpistm
committed
Add HAL module driver definition for PinMap array definition.
This will avoid to embed unneeded array if HAL module is disabled. Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent b113598 commit 1b1af65

File tree

11 files changed

+293
-2
lines changed

11 files changed

+293
-2
lines changed

‎variants/DISCO_F407VG/PeripheralPins.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
//*** ADC ***
3939

40+
#ifdef HAL_ADC_MODULE_ENABLED
4041
const PinMap PinMap_ADC[] = {
4142
// {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0 - User Blue button
4243
// {PA_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0 - User Blue button
@@ -80,35 +81,43 @@ const PinMap PinMap_ADC[] = {
8081
// {PC_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
8182
{NC, NP, 0}
8283
};
84+
#endif
8385

8486
//*** DAC ***
8587

88+
#ifdef HAL_DAC_MODULE_ENABLED
8689
const PinMap PinMap_DAC[] = {
8790
// {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - I2S3_WS
8891
{PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
8992
{NC, NP, 0}
9093
};
94+
#endif
9195

9296
//*** I2C ***
9397

98+
#ifdef HAL_I2C_MODULE_ENABLED
9499
const PinMap PinMap_I2C_SDA[] = {
95100
{PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
96101
// {PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SDA
97102
{PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
98103
{PC_9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
99104
{NC, NP, 0}
100105
};
106+
#endif
101107

108+
#ifdef HAL_I2C_MODULE_ENABLED
102109
const PinMap PinMap_I2C_SCL[] = {
103110
{PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
104111
// {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SCL
105112
{PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
106113
// {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, // Mic CLK
107114
{NC, NP, 0}
108115
};
116+
#endif
109117

110118
//*** PWM ***
111119

120+
#ifdef HAL_TIM_MODULE_ENABLED
112121
const PinMap PinMap_PWM[] = {
113122
// {PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 - User Blue button
114123
// {PA_0, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1 - User Blue button
@@ -180,9 +189,11 @@ const PinMap PinMap_PWM[] = {
180189
{PE_14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
181190
{NC, NP, 0}
182191
};
192+
#endif
183193

184194
//*** SERIAL ***
185195

196+
#ifdef HAL_UART_MODULE_ENABLED
186197
const PinMap PinMap_UART_TX[] = {
187198
// {PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // User Blue button
188199
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
@@ -197,7 +208,9 @@ const PinMap PinMap_UART_TX[] = {
197208
{PD_8, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
198209
{NC, NP, 0}
199210
};
211+
#endif
200212

213+
#ifdef HAL_UART_MODULE_ENABLED
201214
const PinMap PinMap_UART_RX[] = {
202215
{PA_1, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
203216
{PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
@@ -212,7 +225,9 @@ const PinMap PinMap_UART_RX[] = {
212225
{PD_9, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
213226
{NC, NP, 0}
214227
};
228+
#endif
215229

230+
#ifdef HAL_UART_MODULE_ENABLED
216231
const PinMap PinMap_UART_RTS[] = {
217232
{PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
218233
// {PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
@@ -221,7 +236,9 @@ const PinMap PinMap_UART_RTS[] = {
221236
// {PD_12, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // LED4 Blue
222237
{NC, NP, 0}
223238
};
239+
#endif
224240

241+
#ifdef HAL_UART_MODULE_ENABLED
225242
const PinMap PinMap_UART_CTS[] = {
226243
// {PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // User Blue button
227244
// {PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
@@ -230,9 +247,11 @@ const PinMap PinMap_UART_CTS[] = {
230247
{PD_11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
231248
{NC, NP, 0}
232249
};
250+
#endif
233251

234252
//*** SPI ***
235253

254+
#ifdef HAL_SPI_MODULE_ENABLED
236255
const PinMap PinMap_SPI_MOSI[] = {
237256
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
238257
// {PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
@@ -242,7 +261,9 @@ const PinMap PinMap_SPI_MOSI[] = {
242261
// {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_SD
243262
{NC, NP, 0}
244263
};
264+
#endif
245265

266+
#ifdef HAL_SPI_MODULE_ENABLED
246267
const PinMap PinMap_SPI_MISO[] = {
247268
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
248269
// {PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
@@ -252,7 +273,9 @@ const PinMap PinMap_SPI_MISO[] = {
252273
// {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
253274
{NC, NP, 0}
254275
};
276+
#endif
255277

278+
#ifdef HAL_SPI_MODULE_ENABLED
256279
const PinMap PinMap_SPI_SCLK[] = {
257280
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
258281
// {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // T_SWO
@@ -263,7 +286,9 @@ const PinMap PinMap_SPI_SCLK[] = {
263286

264287
{NC, NP, 0}
265288
};
289+
#endif
266290

291+
#ifdef HAL_SPI_MODULE_ENABLED
267292
const PinMap PinMap_SPI_SSEL[] = {
268293
// {PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // I2S3_WS
269294
// {PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_WS
@@ -273,9 +298,11 @@ const PinMap PinMap_SPI_SSEL[] = {
273298
{PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
274299
{NC, NP, 0}
275300
};
301+
#endif
276302

277303
//*** CAN ***
278304

305+
#ifdef HAL_CAN_MODULE_ENABLED
279306
const PinMap PinMap_CAN_RD[] = {
280307
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
281308
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -284,7 +311,9 @@ const PinMap PinMap_CAN_RD[] = {
284311
{PD_0, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
285312
{NC, NP, 0}
286313
};
314+
#endif
287315

316+
#ifdef HAL_CAN_MODULE_ENABLED
288317
const PinMap PinMap_CAN_TD[] = {
289318
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
290319
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // Audio_SCL
@@ -293,3 +322,4 @@ const PinMap PinMap_CAN_TD[] = {
293322
{PD_1, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
294323
{NC, NP, 0}
295324
};
325+
#endif

‎variants/DISCO_F746NG/PeripheralPins.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
//*** ADC ***
4040

41+
#ifdef HAL_ADC_MODULE_ENABLED
4142
const PinMap PinMap_ADC[] = {
4243
// {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
4344
// {PA_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
@@ -89,17 +90,21 @@ const PinMap PinMap_ADC[] = {
8990
{PF_10, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - A1
9091
{NC, NP, 0}
9192
};
93+
#endif
9294

9395
//*** DAC ***
9496

97+
#ifdef HAL_DAC_MODULE_ENABLED
9598
const PinMap PinMap_DAC[] = {
9699
{PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
97100
{PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
98101
{NC, NP, 0}
99102
};
103+
#endif
100104

101105
//*** I2C ***
102106

107+
#ifdef HAL_I2C_MODULE_ENABLED
103108
const PinMap PinMap_I2C_SDA[] = {
104109
// {PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
105110
{PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // D14
@@ -113,7 +118,9 @@ const PinMap PinMap_I2C_SDA[] = {
113118
// {PH_12, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
114119
{NC, NP, 0}
115120
};
121+
#endif
116122

123+
#ifdef HAL_I2C_MODULE_ENABLED
117124
const PinMap PinMap_I2C_SCL[] = {
118125
// {PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
119126
// {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
@@ -127,9 +134,11 @@ const PinMap PinMap_I2C_SCL[] = {
127134
// {PH_11, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
128135
{NC, NP, 0}
129136
};
137+
#endif
130138

131139
//*** PWM ***
132140

141+
#ifdef HAL_TIM_MODULE_ENABLED
133142
const PinMap PinMap_PWM[] = {
134143
{PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 - A0
135144
// {PA_0, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1 - A0
@@ -218,9 +227,11 @@ const PinMap PinMap_PWM[] = {
218227
// {PI_7, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
219228
{NC, NP, 0}
220229
};
230+
#endif
221231

222232
//*** SERIAL ***
223233

234+
#ifdef HAL_UART_MODULE_ENABLED
224235
const PinMap PinMap_UART_TX[] = {
225236
{PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // A0
226237
// {PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
@@ -239,7 +250,9 @@ const PinMap PinMap_UART_TX[] = {
239250
// {PG_14, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
240251
{NC, NP, 0}
241252
};
253+
#endif
242254

255+
#ifdef HAL_UART_MODULE_ENABLED
243256
const PinMap PinMap_UART_RX[] = {
244257
// {PA_1, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
245258
// {PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
@@ -258,7 +271,9 @@ const PinMap PinMap_UART_RX[] = {
258271
// {PG_9, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
259272
{NC, NP, 0}
260273
};
274+
#endif
261275

276+
#ifdef HAL_UART_MODULE_ENABLED
262277
const PinMap PinMap_UART_RTS[] = {
263278
// {PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
264279
// {PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@@ -274,7 +289,9 @@ const PinMap PinMap_UART_RTS[] = {
274289
// {PG_12, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
275290
{NC, NP, 0}
276291
};
292+
#endif
277293

294+
#ifdef HAL_UART_MODULE_ENABLED
278295
const PinMap PinMap_UART_CTS[] = {
279296
// {PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // A0
280297
// {PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@@ -290,9 +307,11 @@ const PinMap PinMap_UART_CTS[] = {
290307
// {PG_15, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
291308
{NC, NP, 0}
292309
};
310+
#endif
293311

294312
//*** SPI ***
295313

314+
#ifdef HAL_SPI_MODULE_ENABLED
296315
const PinMap PinMap_SPI_MOSI[] = {
297316
// {PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
298317
// {PB_2, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
@@ -311,7 +330,9 @@ const PinMap PinMap_SPI_MOSI[] = {
311330
{PI_3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D7
312331
{NC, NP, 0}
313332
};
333+
#endif
314334

335+
#ifdef HAL_SPI_MODULE_ENABLED
315336
const PinMap PinMap_SPI_MISO[] = {
316337
// {PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
317338
// {PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
@@ -327,7 +348,9 @@ const PinMap PinMap_SPI_MISO[] = {
327348
{PI_2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D8
328349
{NC, NP, 0}
329350
};
351+
#endif
330352

353+
#ifdef HAL_SPI_MODULE_ENABLED
331354
const PinMap PinMap_SPI_SCLK[] = {
332355
// {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
333356
// {PA_9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -345,7 +368,9 @@ const PinMap PinMap_SPI_SCLK[] = {
345368
{PI_1, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D13
346369
{NC, NP, 0}
347370
};
371+
#endif
348372

373+
#ifdef HAL_SPI_MODULE_ENABLED
349374
const PinMap PinMap_SPI_SSEL[] = {
350375
// {PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
351376
// {PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
@@ -362,9 +387,11 @@ const PinMap PinMap_SPI_SSEL[] = {
362387
{PI_0, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D10
363388
{NC, NP, 0}
364389
};
390+
#endif
365391

366392
//*** CAN ***
367393

394+
#ifdef HAL_CAN_MODULE_ENABLED
368395
const PinMap PinMap_CAN_RD[] = {
369396
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
370397
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -374,7 +401,9 @@ const PinMap PinMap_CAN_RD[] = {
374401
// {PI_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
375402
{NC, NP, 0}
376403
};
404+
#endif
377405

406+
#ifdef HAL_CAN_MODULE_ENABLED
378407
const PinMap PinMap_CAN_TD[] = {
379408
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
380409
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -384,6 +413,7 @@ const PinMap PinMap_CAN_TD[] = {
384413
// {PH_13, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
385414
{NC, NP, 0}
386415
};
416+
#endif
387417

388418
//*** ETHERNET ***
389419

0 commit comments

Comments
 (0)