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

STM32 : PeripheralPins.c and PinNames.h files alignment #6931

Merged
merged 17 commits into from May 22, 2018

Conversation

Projects
None yet
5 participants
@jeromecoutant
Contributor

jeromecoutant commented May 16, 2018

Description

All STM32 PeripheralPins.c and PinNames.h files are now aligned

Script from #6929 has been applied for only (but all) NUCLEO and DISCO boards.

Regression tests are green on my side.

Pull request type

[ ] Fix
[X] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@cmonr cmonr added the needs: review label May 16, 2018

@bcostm

Looks great! Thanks.
I tried to check all files and found some issues below. Seems also that QSPI pins are missing ?

// {PA_14, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, // SWCLK
{PB_6, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
{NC, NC, 0}
{PA_2, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, // Connected to STDIO_UART_TX

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

Humm no PA_1 now. Can you double check with datasheet ?

This comment has been minimized.

@jeromecoutant

jeromecoutant May 17, 2018

Contributor

Checked: no UART_TX PA_1

{PA_2, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Connected to STDIO_UART_TX
{PA_9, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
// {PA_14, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Connected to SWCLK
{PB_3, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Connected to SWO

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

We don't comment pins connected to SWO?

This comment has been minimized.

@jeromecoutant

jeromecoutant May 17, 2018

Contributor

After discussion, we will not comment SWO pin,
and I need to remove comment for SWCLK

USB_DM = PA_11,
USB_DP = PA_12,
/**** No ETHERNET pins ***/

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

Maybe remove these comments when there are no pins ?

This comment has been minimized.

@jeromecoutant

jeromecoutant May 17, 2018

Contributor

agree

#ifdef MBED_CONF_TARGET_STDIO_UART_TX
{PA_2, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
{PA_2, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 // Connected to STDIO_UART_TX

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

Why these pins are not commented ? It looks like this file has not been well processed by the script ? The warning above about the STDIO pins is also different.

This comment has been minimized.

@jeromecoutant

jeromecoutant May 17, 2018

Contributor

There is a specific case for the NUCLEO_F401RE...
I have implemented the MBED_CONF_TARGET_STDIO_UART_TX switch ifdef before proposing the WEAK feature.
I think I can't remove this now.

{PB_15, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI2)},
{PC_3, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI2)},
{PC_12, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF6_SPI3)},
{PD_6, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)},

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

it is GPIO_AF5_SPI3

{PE_12, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, // Connected to D9 [D9_IS66WV51216EBLL]
{PG_5, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, // Connected to PSRAM_A15 [A15_IS66WV51216EBLL]
{PG_12, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF6_SPI3)}, // Connected to UART1_RTS [STMOD+_UART]
{PI_0,

This comment has been minimized.

@bcostm

bcostm May 17, 2018

Contributor

All QSPI pins have disappeared.

This comment has been minimized.

@jeromecoutant

jeromecoutant May 17, 2018

Contributor

Yes, as QSPI is not in master yet

@0xc0170 0xc0170 added needs: work and removed needs: review labels May 17, 2018

STM32 PeripheralPins.c second update after review
genpinmap script version 1.1
@jeromecoutant

This comment has been minimized.

Contributor

jeromecoutant commented May 17, 2018

Thx @bcostm for the review

Updates have been pushed : b30f3ab

@bcostm

bcostm approved these changes May 18, 2018

@cmonr cmonr added needs: review and removed needs: work labels May 21, 2018

@cmonr

cmonr approved these changes May 21, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented May 21, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented May 21, 2018

Build : SUCCESS

Build number : 2085
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6931/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels May 22, 2018

@cmonr cmonr merged commit 3bcc076 into ARMmbed:master May 22, 2018

13 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/astyle Passed, 845 warnings
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9576 cycles (-113 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/littlefs Passed, code size is 9964B (+0.00%)
Details
travis-ci/tools Local tools testing has passed
Details

@cmonr cmonr removed the ready for merge label May 22, 2018

@jeromecoutant jeromecoutant deleted the jeromecoutant:PR_PERIPH branch May 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment