Skip to content

merge from inav #1

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.

Sign up for GitHub

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 4 commits into from
Nov 3, 2020
Merged

merge from inav #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57004c8
Create separate target for SDCARD default for MATEKF722WPX
stronnag Nov 1, 2020
d97c282
Merge pull request #6252 from iNavFlight/jh_separate_matekf722wpx
digitalentity Nov 2, 2020
dd782a0
fix incorrect error code F7 / sd mmc
stronnag Nov 2, 2020
9cb7163
Merge pull request #6257 from iNavFlight/jh_f7_sd_mmc_error_enum
digitalentity Nov 3, 2020
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
4 changes: 2 additions & 2 deletions src/main/drivers/sdcard/sdmmc_sdio_f7xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static SD_Error_t SD_InitializeCard(void)
SD_GetResponse(SD_Handle.CID);
}

if ((SD_CardType == SD_STD_CAPACITY_V1_1) || (SD_CardType == SD_STD_CAPACITY_V2_0) ||
if ((SD_CardType == SD_STD_CAPACITY_V1_1) || (SD_CardType == SD_STD_CAPACITY_V2_0) ||
(SD_CardType == SD_SECURE_DIGITAL_IO_COMBO) || (SD_CardType == SD_HIGH_CAPACITY)) {
// Send CMD3 SET_REL_ADDR with argument 0
// SD Card publishes its RCA.
Expand Down Expand Up @@ -1000,7 +1000,7 @@ SD_Error_t SD_GetStatus(void)
}
}
else {
ErrorState = SD_CARD_ERROR;
ErrorState = SD_ERROR;
}

return ErrorState;
Expand Down
1 change: 1 addition & 0 deletions src/main/target/MATEKF722PX/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
target_stm32f722xe(MATEKF722PX)
target_stm32f722xe(MATEKF722WPX)
28 changes: 15 additions & 13 deletions src/main/target/MATEKF722PX/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define TARGET_BOARD_IDENTIFIER "MF7P"
#define USBD_PRODUCT_STRING "MATEKF722PX"

#define LED0 PA14 //Blue SWCLK
#define LED0 PA14 //Blue SWCLK
#define LED1 PA13 //Green SWDIO

#define BEEPER PC13
Expand Down Expand Up @@ -79,17 +79,20 @@
#define SPI2_MOSI_PIN PC3

//F722-PX,F722-HD
#define USE_FLASHFS
#define USE_FLASH_M25P16
#define M25P16_SPI_BUS BUS_SPI2
#define M25P16_CS_PIN PB12
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT

#if defined(MATEKF722PX)
#define USE_FLASHFS
#define USE_FLASH_M25P16
#define M25P16_SPI_BUS BUS_SPI2
#define M25P16_CS_PIN PB12
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#else
//F722-WPX
#define USE_SDCARD
#define USE_SDCARD_SPI
#define SDCARD_SPI_BUS BUS_SPI2
#define SDCARD_CS_PIN PC15
#define USE_SDCARD
#define USE_SDCARD_SPI
#define SDCARD_SPI_BUS BUS_SPI2
#define SDCARD_CS_PIN PC15
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#endif

// *************** UART *****************************
#define USE_VCP
Expand Down Expand Up @@ -119,7 +122,7 @@
#define USE_UART6
#define UART6_TX_PIN PC6
#define UART6_RX_PIN PC7

#define USE_SOFTSERIAL1
#define SOFTSERIAL_1_TX_PIN PA2 //TX2 pad
#define SOFTSERIAL_1_RX_PIN NONE
Expand Down Expand Up @@ -170,4 +173,3 @@
#define USE_DSHOT
#define USE_SERIALSHOT
#define USE_ESC_SENSOR