Skip to content

Sdmmc signals #2053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions CI/update/stm32variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,21 @@ def alias_definition():
return alias_list


def sdmmc_signals():
sdmmcNA_list = []
# Check if SDMMC instance
if sdxd0_list and "SDMMC" in sdxd0_list[0][2]:
if not sdmmcckin_list:
sdmmcNA_list.append("SDMMC_CKIN_NA")
if not sdmmccdir_list:
sdmmcNA_list.append("SDMMC_CDIR_NA")
if not sdmmcd0dir_list:
sdmmcNA_list.append("SDMMC_D0DIR_NA")
if not sdmmcd123dir_list:
sdmmcNA_list.append("SDMMC_D123DIR_NA")
return sdmmcNA_list


def print_variant(generic_list, alt_syswkup_list):
variant_h_template = j2_env.get_template(variant_h_filename)
variant_cpp_template = j2_env.get_template(variant_cpp_filename)
Expand All @@ -1467,6 +1482,9 @@ def print_variant(generic_list, alt_syswkup_list):
# Alias to ease some usage
alias_list = alias_definition()

# SDMMC signals definition
sdmmcNA_list = sdmmc_signals()

# Manage all pins number, PinName and analog pins
analog_index = 0
pins_number_list = []
Expand Down Expand Up @@ -1548,6 +1566,7 @@ def print_variant(generic_list, alt_syswkup_list):
serial=serial,
hal_modules_list=hal_modules_list,
alias_list=alias_list,
sdmmcNA_list=sdmmcNA_list,
)
)

Expand Down
7 changes: 7 additions & 0 deletions CI/update/templates/variant_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
#endif
{% endfor %}

{% endif %}
{% if sdmmcNA_list %}
// SDMMC signals not available
{% for sdmmcNA in sdmmcNA_list %}
#define {{sdmmcNA}}
{% endfor %}

{% endif %}
{% if hal_modules_list %}
// Extra HAL modules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@
// Value of the External oscillator in Hz
#define HSE_VALUE 8000000U

/* Extra HAL modules */
// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
6 changes: 6 additions & 0 deletions variants/STM32F7xx/F722Z(C-E)T_F732ZET/variant_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@
#define ECAT_CS PB6

// Serial pins
#define TX0 PC10 // UART4
#define RX0 PC11 // UART4
#define TX0_ALT PC10_ALT1 // USART3
#define TX0 PC10 // UART4
#define RX0 PC11 // UART4
#define TX0_ALT PC10_ALT1 // USART3
#define RX0_ALT PC11_ALT1 // USART3

#define TX1 PE8 // UART7
Expand Down Expand Up @@ -257,6 +257,12 @@
// Value of the External oscillator in Hz
#define HSE_VALUE 8000000U

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@
// Value of the External oscillator in Hz
#define HSE_VALUE 8000000U

/* Extra HAL modules */
// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@
#define PIN_SERIAL_TX PA9
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// SD detect signal
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN PC13
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
#define PIN_SERIAL_RX PA10
#define PIN_SERIAL_TX PA9

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

/* HAL configuration */
#define HSE_VALUE 24000000U

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@
// Value of the External oscillator in Hz
#define HSE_VALUE 8000000U

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

/* Extra HAL modules */
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
6 changes: 6 additions & 0 deletions variants/STM32F7xx/F769I(G-I)T_F779IIT/variant_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CKIN_NA
#define SDMMC_CDIR_NA
#define SDMMC_D0DIR_NA
#define SDMMC_D123DIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
3 changes: 3 additions & 0 deletions variants/STM32H5xx/H562R(G-I)T/variant_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@
#define PIN_SERIAL_TX PA0
#endif

// SDMMC signals not available
#define SDMMC_CDIR_NA

// Extra HAL modules
#if !defined(HAL_DAC_MODULE_DISABLED)
#define HAL_DAC_MODULE_ENABLED
Expand Down
Loading