Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 04:46:51 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[stm32][f1][spi] fix gpio init slave mode

Browse Source 
see #1371
This commit is contained in:
Felix Ruess
2015-10-02 15:22:30 +02:00
parent b11577cc33
commit a4496a9fee
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/mcu_periph/spi_arch.c
+10 -24
View File
@@ -1248,18 +1248,11 @@ void spi1_slave_arch_init(void) {
rcc_periph_clock_enable(RCC_SPI1); rcc_periph_clock_enable(RCC_SPI1);
// Configure GPIOs: SCK, MISO and MOSI // Configure GPIOs: SCK, MISO and MOSI
// TODO configure lisa board files to use gpio_setup_pin_af function gpio_setup_pin_af(GPIO_BANK_SPI1_MISO, GPIO_SPI1_MISO, 0, TRUE);
gpio_set_mode(GPIO_BANK_SPI1_SCK, GPIO_MODE_INPUT, gpio_setup_pin_af(GPIO_BANK_SPI1_MOSI, GPIO_SPI1_MOSI, 0, FALSE);
GPIO_CNF_INPUT_FLOAT, gpio_setup_pin_af(GPIO_BANK_SPI1_SCK, GPIO_SPI1_SCK, 0, FALSE);
GPIO_SPI1_SCK | GPIO_SPI1_MOSI); // set NSS as input
gpio_setup_pin_af(GPIO_BANK_SPI1_NSS, GPIO_SPI1_NSS, 0, FALSE);
gpio_set_mode(GPIO_BANK_SPI1_MISO, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL,
GPIO_SPI1_MISO);
gpio_set_mode(GPIO_BANK_SPI1_NSS, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT,
GPIO_SPI1_NSS);
// reset SPI // reset SPI
spi_reset(SPI1); spi_reset(SPI1);
@@ -1342,18 +1335,11 @@ void spi2_slave_arch_init(void) {
rcc_periph_clock_enable(RCC_SPI2); rcc_periph_clock_enable(RCC_SPI2);
// Configure GPIOs: SCK, MISO and MOSI // Configure GPIOs: SCK, MISO and MOSI
// TODO configure lisa board files to use gpio_setup_pin_af function gpio_setup_pin_af(GPIO_BANK_SPI2_MISO, GPIO_SPI1_MISO, 0, TRUE);
gpio_set_mode(GPIO_BANK_SPI2_SCK, GPIO_MODE_INPUT, gpio_setup_pin_af(GPIO_BANK_SPI2_MOSI, GPIO_SPI2_MOSI, 0, FALSE);
GPIO_CNF_INPUT_FLOAT, gpio_setup_pin_af(GPIO_BANK_SPI2_SCK, GPIO_SPI2_SCK, 0, FALSE);
GPIO_SPI2_SCK | GPIO_SPI2_MOSI); // set NSS as input
gpio_setup_pin_af(GPIO_BANK_SPI2_NSS, GPIO_SPI2_NSS, 0, FALSE);
gpio_set_mode(GPIO_BANK_SPI2_MISO, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL,
GPIO_SPI2_MISO);
gpio_set_mode(GPIO_BANK_SPI2_NSS, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT,
GPIO_SPI2_NSS);
// reset SPI // reset SPI
spi_reset(SPI2); spi_reset(SPI2);