Skip to content

Commit b0ac294

Browse files
authored
Merge pull request #2053 from fpistm/SDMMC_signals
Sdmmc signals
2 parents 7058272 + cbb70fb commit b0ac294

File tree

76 files changed

+449
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+449
-5
lines changed

CI/update/stm32variant.py

+19
Original file line numberDiff line numberDiff line change
@@ -1443,6 +1443,21 @@ def alias_definition():
14431443
return alias_list
14441444

14451445

1446+
def sdmmc_signals():
1447+
sdmmcNA_list = []
1448+
# Check if SDMMC instance
1449+
if sdxd0_list and "SDMMC" in sdxd0_list[0][2]:
1450+
if not sdmmcckin_list:
1451+
sdmmcNA_list.append("SDMMC_CKIN_NA")
1452+
if not sdmmccdir_list:
1453+
sdmmcNA_list.append("SDMMC_CDIR_NA")
1454+
if not sdmmcd0dir_list:
1455+
sdmmcNA_list.append("SDMMC_D0DIR_NA")
1456+
if not sdmmcd123dir_list:
1457+
sdmmcNA_list.append("SDMMC_D123DIR_NA")
1458+
return sdmmcNA_list
1459+
1460+
14461461
def print_variant(generic_list, alt_syswkup_list):
14471462
variant_h_template = j2_env.get_template(variant_h_filename)
14481463
variant_cpp_template = j2_env.get_template(variant_cpp_filename)
@@ -1467,6 +1482,9 @@ def print_variant(generic_list, alt_syswkup_list):
14671482
# Alias to ease some usage
14681483
alias_list = alias_definition()
14691484

1485+
# SDMMC signals definition
1486+
sdmmcNA_list = sdmmc_signals()
1487+
14701488
# Manage all pins number, PinName and analog pins
14711489
analog_index = 0
14721490
pins_number_list = []
@@ -1548,6 +1566,7 @@ def print_variant(generic_list, alt_syswkup_list):
15481566
serial=serial,
15491567
hal_modules_list=hal_modules_list,
15501568
alias_list=alias_list,
1569+
sdmmcNA_list=sdmmcNA_list,
15511570
)
15521571
)
15531572

CI/update/templates/variant_generic.h

+7
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@
107107
#endif
108108
{% endfor %}
109109

110+
{% endif %}
111+
{% if sdmmcNA_list %}
112+
// SDMMC signals not available
113+
{% for sdmmcNA in sdmmcNA_list %}
114+
#define {{sdmmcNA}}
115+
{% endfor %}
116+
110117
{% endif %}
111118
{% if hal_modules_list %}
112119
// Extra HAL modules

variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,12 @@
269269
#define PIN_SERIAL_TX PA0
270270
#endif
271271

272+
// SDMMC signals not available
273+
#define SDMMC_CKIN_NA
274+
#define SDMMC_CDIR_NA
275+
#define SDMMC_D0DIR_NA
276+
#define SDMMC_D123DIR_NA
277+
272278
// Extra HAL modules
273279
#if !defined(HAL_DAC_MODULE_DISABLED)
274280
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,12 @@
178178
#define PIN_SERIAL_TX PA0
179179
#endif
180180

181+
// SDMMC signals not available
182+
#define SDMMC_CKIN_NA
183+
#define SDMMC_CDIR_NA
184+
#define SDMMC_D0DIR_NA
185+
#define SDMMC_D123DIR_NA
186+
181187
// Extra HAL modules
182188
#if !defined(HAL_DAC_MODULE_DISABLED)
183189
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@
211211
#define PIN_SERIAL_TX PA0
212212
#endif
213213

214+
// SDMMC signals not available
215+
#define SDMMC_CKIN_NA
216+
#define SDMMC_CDIR_NA
217+
#define SDMMC_D0DIR_NA
218+
#define SDMMC_D123DIR_NA
219+
214220
// Extra HAL modules
215221
#if !defined(HAL_DAC_MODULE_DISABLED)
216222
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_NUCLEO_F722ZE.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,12 @@
223223
// Value of the External oscillator in Hz
224224
#define HSE_VALUE 8000000U
225225

226-
/* Extra HAL modules */
226+
// SDMMC signals not available
227+
#define SDMMC_CKIN_NA
228+
#define SDMMC_CDIR_NA
229+
#define SDMMC_D0DIR_NA
230+
#define SDMMC_D123DIR_NA
231+
227232
// Extra HAL modules
228233
#if !defined(HAL_DAC_MODULE_DISABLED)
229234
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@
243243
#define PIN_SERIAL_TX PA0
244244
#endif
245245

246+
// SDMMC signals not available
247+
#define SDMMC_CKIN_NA
248+
#define SDMMC_CDIR_NA
249+
#define SDMMC_D0DIR_NA
250+
#define SDMMC_D123DIR_NA
251+
246252
// Extra HAL modules
247253
#if !defined(HAL_DAC_MODULE_DISABLED)
248254
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,12 @@
263263
#define PIN_SERIAL_TX PA0
264264
#endif
265265

266+
// SDMMC signals not available
267+
#define SDMMC_CKIN_NA
268+
#define SDMMC_CDIR_NA
269+
#define SDMMC_D0DIR_NA
270+
#define SDMMC_D123DIR_NA
271+
266272
// Extra HAL modules
267273
#if !defined(HAL_DAC_MODULE_DISABLED)
268274
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@
204204
#define PIN_SERIAL_TX PA0
205205
#endif
206206

207+
// SDMMC signals not available
208+
#define SDMMC_CKIN_NA
209+
#define SDMMC_CDIR_NA
210+
#define SDMMC_D0DIR_NA
211+
#define SDMMC_D123DIR_NA
212+
207213
// Extra HAL modules
208214
#if !defined(HAL_DAC_MODULE_DISABLED)
209215
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@
237237
#define PIN_SERIAL_TX PA0
238238
#endif
239239

240+
// SDMMC signals not available
241+
#define SDMMC_CKIN_NA
242+
#define SDMMC_CDIR_NA
243+
#define SDMMC_D0DIR_NA
244+
#define SDMMC_D123DIR_NA
245+
240246
// Extra HAL modules
241247
#if !defined(HAL_DAC_MODULE_DISABLED)
242248
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,12 @@
269269
#define PIN_SERIAL_TX PA0
270270
#endif
271271

272+
// SDMMC signals not available
273+
#define SDMMC_CKIN_NA
274+
#define SDMMC_CDIR_NA
275+
#define SDMMC_D0DIR_NA
276+
#define SDMMC_D123DIR_NA
277+
272278
// Extra HAL modules
273279
#if !defined(HAL_DAC_MODULE_DISABLED)
274280
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@
211211
#define PIN_SERIAL_TX PA0
212212
#endif
213213

214+
// SDMMC signals not available
215+
#define SDMMC_CKIN_NA
216+
#define SDMMC_CDIR_NA
217+
#define SDMMC_D0DIR_NA
218+
#define SDMMC_D123DIR_NA
219+
214220
// Extra HAL modules
215221
#if !defined(HAL_DAC_MODULE_DISABLED)
216222
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_ETHERCAT_DUINO.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@
167167
#define ECAT_CS PB6
168168

169169
// Serial pins
170-
#define TX0 PC10 // UART4
171-
#define RX0 PC11 // UART4
172-
#define TX0_ALT PC10_ALT1 // USART3
170+
#define TX0 PC10 // UART4
171+
#define RX0 PC11 // UART4
172+
#define TX0_ALT PC10_ALT1 // USART3
173173
#define RX0_ALT PC11_ALT1 // USART3
174174

175175
#define TX1 PE8 // UART7
@@ -257,6 +257,12 @@
257257
// Value of the External oscillator in Hz
258258
#define HSE_VALUE 8000000U
259259

260+
// SDMMC signals not available
261+
#define SDMMC_CKIN_NA
262+
#define SDMMC_CDIR_NA
263+
#define SDMMC_D0DIR_NA
264+
#define SDMMC_D123DIR_NA
265+
260266
// Extra HAL modules
261267
#if !defined(HAL_DAC_MODULE_DISABLED)
262268
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_NUCLEO_F7x6ZG.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,12 @@
223223
// Value of the External oscillator in Hz
224224
#define HSE_VALUE 8000000U
225225

226-
/* Extra HAL modules */
226+
// SDMMC signals not available
227+
#define SDMMC_CKIN_NA
228+
#define SDMMC_CDIR_NA
229+
#define SDMMC_D0DIR_NA
230+
#define SDMMC_D123DIR_NA
231+
227232
// Extra HAL modules
228233
#if !defined(HAL_DAC_MODULE_DISABLED)
229234
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@
243243
#define PIN_SERIAL_TX PA0
244244
#endif
245245

246+
// SDMMC signals not available
247+
#define SDMMC_CKIN_NA
248+
#define SDMMC_CDIR_NA
249+
#define SDMMC_D0DIR_NA
250+
#define SDMMC_D123DIR_NA
251+
246252
// Extra HAL modules
247253
#if !defined(HAL_DAC_MODULE_DISABLED)
248254
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_DISCO_F746NG.h

+6
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@
267267
#define PIN_SERIAL_TX PA9
268268
#endif
269269

270+
// SDMMC signals not available
271+
#define SDMMC_CKIN_NA
272+
#define SDMMC_CDIR_NA
273+
#define SDMMC_D0DIR_NA
274+
#define SDMMC_D123DIR_NA
275+
270276
// SD detect signal
271277
#ifndef SD_DETECT_PIN
272278
#define SD_DETECT_PIN PC13

variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,12 @@
297297
#define PIN_SERIAL_TX PA0
298298
#endif
299299

300+
// SDMMC signals not available
301+
#define SDMMC_CKIN_NA
302+
#define SDMMC_CDIR_NA
303+
#define SDMMC_D0DIR_NA
304+
#define SDMMC_D123DIR_NA
305+
300306
// Extra HAL modules
301307
#if !defined(HAL_DAC_MODULE_DISABLED)
302308
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,12 @@
304304
#define PIN_SERIAL_TX PA0
305305
#endif
306306

307+
// SDMMC signals not available
308+
#define SDMMC_CKIN_NA
309+
#define SDMMC_CDIR_NA
310+
#define SDMMC_D0DIR_NA
311+
#define SDMMC_D123DIR_NA
312+
307313
// Extra HAL modules
308314
#if !defined(HAL_DAC_MODULE_DISABLED)
309315
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,12 @@
276276
#define PIN_SERIAL_TX PA0
277277
#endif
278278

279+
// SDMMC signals not available
280+
#define SDMMC_CKIN_NA
281+
#define SDMMC_CDIR_NA
282+
#define SDMMC_D0DIR_NA
283+
#define SDMMC_D123DIR_NA
284+
279285
// Extra HAL modules
280286
#if !defined(HAL_DAC_MODULE_DISABLED)
281287
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_REMRAM_V1.h

+6
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@
201201
#define PIN_SERIAL_RX PA10
202202
#define PIN_SERIAL_TX PA9
203203

204+
// SDMMC signals not available
205+
#define SDMMC_CKIN_NA
206+
#define SDMMC_CDIR_NA
207+
#define SDMMC_D0DIR_NA
208+
#define SDMMC_D123DIR_NA
209+
204210
/* HAL configuration */
205211
#define HSE_VALUE 24000000U
206212

variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@
218218
#define PIN_SERIAL_TX PA0
219219
#endif
220220

221+
// SDMMC signals not available
222+
#define SDMMC_CKIN_NA
223+
#define SDMMC_CDIR_NA
224+
#define SDMMC_D0DIR_NA
225+
#define SDMMC_D123DIR_NA
226+
221227
// Extra HAL modules
222228
#if !defined(HAL_DAC_MODULE_DISABLED)
223229
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_NUCLEO_F767ZI.h

+6
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,12 @@
224224
// Value of the External oscillator in Hz
225225
#define HSE_VALUE 8000000U
226226

227+
// SDMMC signals not available
228+
#define SDMMC_CKIN_NA
229+
#define SDMMC_CDIR_NA
230+
#define SDMMC_D0DIR_NA
231+
#define SDMMC_D123DIR_NA
232+
227233
/* Extra HAL modules */
228234
#if !defined(HAL_DAC_MODULE_DISABLED)
229235
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@
250250
#define PIN_SERIAL_TX PA0
251251
#endif
252252

253+
// SDMMC signals not available
254+
#define SDMMC_CKIN_NA
255+
#define SDMMC_CDIR_NA
256+
#define SDMMC_D0DIR_NA
257+
#define SDMMC_D123DIR_NA
258+
253259
// Extra HAL modules
254260
#if !defined(HAL_DAC_MODULE_DISABLED)
255261
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,12 @@
258258
#define PIN_SERIAL_TX PA0
259259
#endif
260260

261+
// SDMMC signals not available
262+
#define SDMMC_CKIN_NA
263+
#define SDMMC_CDIR_NA
264+
#define SDMMC_D0DIR_NA
265+
#define SDMMC_D123DIR_NA
266+
261267
// Extra HAL modules
262268
#if !defined(HAL_DAC_MODULE_DISABLED)
263269
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,12 @@
295295
#define PIN_SERIAL_TX PA0
296296
#endif
297297

298+
// SDMMC signals not available
299+
#define SDMMC_CKIN_NA
300+
#define SDMMC_CDIR_NA
301+
#define SDMMC_D0DIR_NA
302+
#define SDMMC_D123DIR_NA
303+
298304
// Extra HAL modules
299305
#if !defined(HAL_DAC_MODULE_DISABLED)
300306
#define HAL_DAC_MODULE_ENABLED

variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h

+6
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@
267267
#define PIN_SERIAL_TX PA0
268268
#endif
269269

270+
// SDMMC signals not available
271+
#define SDMMC_CKIN_NA
272+
#define SDMMC_CDIR_NA
273+
#define SDMMC_D0DIR_NA
274+
#define SDMMC_D123DIR_NA
275+
270276
// Extra HAL modules
271277
#if !defined(HAL_DAC_MODULE_DISABLED)
272278
#define HAL_DAC_MODULE_ENABLED

variants/STM32H5xx/H562R(G-I)T/variant_generic.h

+3
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@
184184
#define PIN_SERIAL_TX PA0
185185
#endif
186186

187+
// SDMMC signals not available
188+
#define SDMMC_CDIR_NA
189+
187190
// Extra HAL modules
188191
#if !defined(HAL_DAC_MODULE_DISABLED)
189192
#define HAL_DAC_MODULE_ENABLED

0 commit comments

Comments
 (0)