Skip to content

feat(flysky): Build option to choose use SDIO or SPI flash #7634

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

Open
richardclli wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −14
Open

feat(flysky): Build option to choose use SDIO or SPI flash #7634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions radio/src/targets/pl18/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
option(DISK_CACHE "Enable SD card disk cache" OFF)
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON)
option(STICK_DEAD_ZONE "Enable sticks dead zone" YES)
option(STICK_DEAD_ZONE "Enable sticks dead zone" ON)
option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" OFF)
option(AFHDS3 "AFHDS3 TX Module" ON)
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
option(GHOST "Ghost TX Module" ON)
option(MODULE_SIZE_STD "Standard size TX Module" ON)
option(USE_RTC_CLOCK "RTC Clock" ON)
option(PREFER_SDIO "Prefer SDIO Storage" ON)

set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(CPU_TYPE STM32F4)
Expand Down Expand Up @@ -45,7 +46,7 @@ add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)

if(PCBREV STREQUAL PL18U)
set(FLAVOUR pl18u)
set(DISK_CACHE ON)
set(HAS_SDIO ON)
set(WIRELESS_CHARGER YES)
set(FLYSKY_GIMBAL ON)
set(LED_STRIP ON)
Expand All @@ -58,7 +59,7 @@ if(PCBREV STREQUAL PL18U)
elseif (PCBREV STREQUAL EL18)
set(FLAVOUR el18)
add_definitions(-DRADIO_NV14_FAMILY -DUSE_HATS_AS_KEYS)
set(DISK_CACHE ON)
set(HAS_SDIO ON)
set(FLYSKY_GIMBAL ON)
set(USE_VS1053B ON)
set(AFHDS3 ON)
Expand All @@ -70,7 +71,7 @@ elseif(PCBREV STREQUAL NV14)
set(FLAVOUR nv14)
add_definitions(-DRADIO_NV14_FAMILY)
add_definitions(-DUSE_HATS_AS_KEYS -DAFHDS2_BAUDRATE=${PCB_RF_BAUD})
set(DISK_CACHE ON)
set(HAS_SDIO ON)
set(FLYSKY_GIMBAL ON)
set(USE_VS1053B ON)
set(AFHDS2 ON)
Expand All @@ -81,7 +82,6 @@ elseif(PCBREV STREQUAL NV14)
set(DEFAULT_INTERNAL_MODULE FLYSKY_AFHDS2A CACHE STRING "Default internal module")
elseif(PCBREV STREQUAL NB4P)
set(FLAVOUR nb4p)
add_definitions(-DSPI_FLASH)
set(ROTARY_ENCODER YES)
set(LED_STRIP ON)
set(AFHDS3 ON)
Expand All @@ -92,15 +92,15 @@ elseif(PCBREV STREQUAL NB4P)
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
elseif(PCBREV STREQUAL PL18EV)
set(FLAVOUR pl18ev)
add_definitions(-DSPI_FLASH -DUSE_HATS_AS_KEYS)
add_definitions(-DUSE_HATS_AS_KEYS)
set(WIRELESS_CHARGER YES)
set(FLYSKY_GIMBAL ON)
set(LED_STRIP ON)
set(AFHDS3 ON)
set(KEY_DRIVER key_driver.cpp)
else()
set(FLAVOUR pl18)
add_definitions(-DSPI_FLASH -DUSE_HATS_AS_KEYS)
add_definitions(-DUSE_HATS_AS_KEYS)
set(WIRELESS_CHARGER YES)
set(FLYSKY_GIMBAL ON)
set(LED_STRIP ON)
Expand Down Expand Up @@ -135,6 +135,12 @@ add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
add_definitions(-DCROSSFIRE_NATIVE)
add_definitions(-DHARDWARE_EXTERNAL_MODULE)

if(PREFER_SDIO)
if(HAS_SDIO)
set(STORAGE_USE_SDIO ON)
endif()
endif()

if(INTERNAL_GPS)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
endif()
Expand Down Expand Up @@ -186,11 +192,15 @@ if(ROTARY_ENCODER)
)
endif()

if(DISK_CACHE)
if(STORAGE_USE_SDIO)
set(BOARD_COMMON_SRC ${BOARD_COMMON_SRC}
disk_cache.cpp
)
add_definitions(-DDISK_CACHE)
add_definitions(-DSTORAGE_USE_SDIO)
else()
add_definitions(-DSPI_FLASH)
add_definitions(-DSTORAGE_USE_SPI_FLASH)
endif()

# Bootloader board library
Expand Down
6 changes: 0 additions & 6 deletions radio/src/targets/pl18/hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,6 @@
#define FLASH_SPI_DMA_TX_STREAM LL_DMA_STREAM_5
#define FLASH_SPI_DMA_RX_STREAM LL_DMA_STREAM_6

#if defined(RADIO_NV14_FAMILY) || defined(RADIO_PL18U)
#define STORAGE_USE_SDIO
#else
#define STORAGE_USE_SPI_FLASH
#endif

// SDRAM
#define SDRAM_RCC_AHB1Periph (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_GPIOG | RCC_AHB1Periph_GPIOH)
#define SDRAM_RCC_AHB3Periph RCC_AHB3Periph_FMC
Expand Down