betaflight / config

Betaflight target definitions
GNU General Public License v3.0
24 stars 86 forks source link

Use USE_FLASH_X25 #388

Closed haslinghuis closed 1 month ago

haslinghuis commented 3 months ago

Define USE_FLASH_M25P16 directly instead of using USE_FLASH_W25M512 and USE_FLASH_W25Q128FV

EDIT: As USE_FLASH_M25P16 also defines USE_FLASH_W25M using USE_FLASH_X25 now - as suggested by @freasy

W25M512 | W25Q128FV -> M25P16
W25M02G -> W25M01G
M25P16 | W25M | W25M01G -> W25M
M25P16 | W25M -> USE_FLASH_CHIP

Suggested firmware change:

#ifdef USE_FLASH

#ifdef USE_FLASH_X25
#define USE_FLASH_W25M
#define USE_FLASH_W25M512
#define USE_FLASH_M25P16
#define USE_FLASH_W25Q128FV
#endif

#if defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25N02G)
#ifndef USE_FLASH_W25M
#define USE_FLASH_W25M
#endif
#endif

#if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M)
#ifndef USE_FLASH_CHIP
#define USE_FLASH_CHIP
#endif

#endif // USE_FLASH_COMMON

#ifndef USE_FLASH_TOOLS
#define USE_FLASH_TOOLS
#endif

#ifndef USE_FLASHFS
#define USE_FLASHFS
#endif

#endif // USE_FLASH
haslinghuis commented 3 months ago

See: https://github.com/betaflight/betaflight/pull/13516