Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Change M25P16 to FLASH where appropriate

Browse source
This commit is contained in:
jflyper 2018-05-02 18:53:45 +09:00
parent 6d72a853dd
commit 36fb439d45
52 changed files with 108 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/flash.c
View file

@ -63,7 +63,7 @@ bool flashInit(const flashConfig_t *flashConfig)
IOConfigGPIO(busdev->busdev_u.spi.csnPin, SPI_IO_CS_CFG); IOConfigGPIO(busdev->busdev_u.spi.csnPin, SPI_IO_CS_CFG);
IOHi(busdev->busdev_u.spi.csnPin); IOHi(busdev->busdev_u.spi.csnPin);
#ifndef M25P16_SPI_SHARED #ifndef FLASH_SPI_SHARED
//Maximum speed for standard READ command is 20mHz, other commands tolerate 25mHz //Maximum speed for standard READ command is 20mHz, other commands tolerate 25mHz
//spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_FAST); //spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_FAST);
spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_STANDARD*2); spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_STANDARD*2);

4
src/main/fc/fc_init.c
View file

@ -256,8 +256,8 @@ void spiPreInit(void)
#if defined(RTC6705_CS_PIN) && !defined(USE_VTX_RTC6705_SOFTSPI) // RTC6705 soft SPI initialisation handled elsewhere. #if defined(RTC6705_CS_PIN) && !defined(USE_VTX_RTC6705_SOFTSPI) // RTC6705 soft SPI initialisation handled elsewhere.
spiPreInitCs(IO_TAG(RTC6705_CS_PIN)); spiPreInitCs(IO_TAG(RTC6705_CS_PIN));
#endif #endif
#ifdef M25P16_CS_PIN #ifdef FLASH_CS_PIN
spiPreInitCs(IO_TAG(M25P16_CS_PIN)); spiPreInitCs(IO_TAG(FLASH_CS_PIN));
#endif #endif
#if defined(USE_RX_SPI) && !defined(USE_RX_SOFTSPI) #if defined(USE_RX_SPI) && !defined(USE_RX_SOFTSPI)
spiPreInitCs(IO_TAG(RX_NSS_PIN)); spiPreInitCs(IO_TAG(RX_NSS_PIN));

6
src/main/pg/flash.c
View file

@ -37,11 +37,11 @@ PG_REGISTER_WITH_RESET_FN(flashConfig_t, flashConfig, PG_FLASH_CONFIG, 0);
void pgResetFn_flashConfig(flashConfig_t *flashConfig) void pgResetFn_flashConfig(flashConfig_t *flashConfig)
{ {
#ifdef M25P16_CS_PIN #ifdef FLASH_CS_PIN
flashConfig->csTag = IO_TAG(M25P16_CS_PIN); flashConfig->csTag = IO_TAG(FLASH_CS_PIN);
#else #else
flashConfig->csTag = IO_TAG_NONE; flashConfig->csTag = IO_TAG_NONE;
#endif #endif
flashConfig->spiDevice = SPI_DEV_TO_CFG(spiDeviceByInstance(M25P16_SPI_INSTANCE)); flashConfig->spiDevice = SPI_DEV_TO_CFG(spiDeviceByInstance(FLASH_SPI_INSTANCE));
} }
#endif #endif

4
src/main/target/AIKONF4/target.h
View file

@ -67,8 +67,8 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN SPI2_NSS_PIN #define FLASH_CS_PIN SPI2_NSS_PIN
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_VCP #define USE_VCP
#define USE_USB_DETECT #define USE_USB_DETECT

4
src/main/target/AIR32/target.h
View file

@ -87,8 +87,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/ALIENFLIGHTF4/target.h
View file

@ -84,8 +84,8 @@
// Performance logging for SD card operations: // Performance logging for SD card operations:
// #define AFATFS_USE_INTROSPECTIVE_LOGGING // #define AFATFS_USE_INTROSPECTIVE_LOGGING
#define M25P16_CS_PIN SPI2_NSS_PIN #define FLASH_CS_PIN SPI2_NSS_PIN
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/ALIENFLIGHTNGF7/target.h
View file

@ -98,8 +98,8 @@
// Performance logging for SD card operations: // Performance logging for SD card operations:
// #define AFATFS_USE_INTROSPECTIVE_LOGGING // #define AFATFS_USE_INTROSPECTIVE_LOGGING
#define M25P16_CS_PIN SPI2_NSS_PIN #define FLASH_CS_PIN SPI2_NSS_PIN
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/ALIENWHOOP/target.h
View file

@ -114,8 +114,8 @@
/* BLACKBOX dataflash available as of V2.1 -- did not exist on V1 and V2 */ /* BLACKBOX dataflash available as of V2.1 -- did not exist on V1 and V2 */
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN SPI3_NSS_PIN #define FLASH_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
/* Motion Processing Unit (MPU) - Invensense 6-axis MPU-6500 or 9-axis MPU-9250 /* Motion Processing Unit (MPU) - Invensense 6-axis MPU-6500 or 9-axis MPU-9250

4
src/main/target/ANYFCM7/target.h
View file

@ -114,8 +114,8 @@
#define SPI3_MISO_PIN PC11 #define SPI3_MISO_PIN PC11
#define SPI3_MOSI_PIN PC12 #define SPI3_MOSI_PIN PC12
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT

4
src/main/target/BETAFLIGHTF4/target.h
View file

@ -64,8 +64,8 @@
#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
#define M25P16_CS_PIN PA15 #define FLASH_CS_PIN PA15
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

2
src/main/target/BLUEJAYF4/initialisation.c
View file

@ -68,7 +68,7 @@ void targetPreInit(void)
/* ensure the CS pin for the flash is pulled hi so any SD card initialisation does not impact the chip */ /* ensure the CS pin for the flash is pulled hi so any SD card initialisation does not impact the chip */
if (hardwareRevision == BJF4_REV3) { if (hardwareRevision == BJF4_REV3) {
IO_t flashIo = IOGetByTag(IO_TAG(M25P16_CS_PIN)); IO_t flashIo = IOGetByTag(IO_TAG(FLASH_CS_PIN));
IOConfigGPIO(flashIo, IOCFG_OUT_PP); IOConfigGPIO(flashIo, IOCFG_OUT_PP);
IOHi(flashIo); IOHi(flashIo);

4
src/main/target/BLUEJAYF4/target.h
View file

@ -93,8 +93,8 @@
// Performance logging for SD card operations: // Performance logging for SD card operations:
// #define AFATFS_USE_INTROSPECTIVE_LOGGING // #define AFATFS_USE_INTROSPECTIVE_LOGGING
#define M25P16_CS_PIN PB7 #define FLASH_CS_PIN PB7
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

6
src/main/target/CC3D/target.h
View file

@ -39,13 +39,11 @@
#define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_1
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define MPU6000_CS_GPIO GPIOA
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1
#define M25P16_CS_GPIO GPIOB #define FLASH_CS_PIN PB12
#define M25P16_CS_PIN PB12 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

7
src/main/target/CHEBUZZF3/target.h
View file

@ -60,13 +60,6 @@
// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx. // Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
#define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5
//#define USE_FLASHFS
//#define USE_FLASH_M25P16
//#define M25P16_CS_GPIO GPIOB
//#define M25P16_CS_PIN GPIO_Pin_12
//#define M25P16_SPI_INSTANCE SPI2
#define USE_GYRO #define USE_GYRO
#define USE_GYRO_L3GD20 #define USE_GYRO_L3GD20
#define USE_GYRO_MPU6050 #define USE_GYRO_MPU6050

4
src/main/target/CLRACINGF4/target.h
View file

@ -87,8 +87,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_VCP #define USE_VCP

4
src/main/target/COLIBRI/target.h
View file

@ -65,8 +65,8 @@
#define USE_BARO #define USE_BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/DALRCF405/target.h
View file

@ -83,8 +83,8 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
//GPS ---------------------------------------------- //GPS ----------------------------------------------
#define USE_GPS #define USE_GPS

6
src/main/target/DOGE/target.h
View file

@ -69,9 +69,9 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_SPI_SHARED #define FLASH_SPI_SHARED
#define M25P16_CS_PIN PC15 #define FLASH_CS_PIN PC15
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_GYRO #define USE_GYRO
#define USE_GYRO_MPU6500 #define USE_GYRO_MPU6500

4
src/main/target/FF_FORTINIF4/target.h
View file

@ -82,8 +82,8 @@
/*---------------------------------*/ /*---------------------------------*/
/*------------FLASH----------------*/ /*------------FLASH----------------*/
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/FF_PIKOF4/target.h
View file

@ -94,8 +94,8 @@
/*---------------------------------*/ /*---------------------------------*/
#else #else
/*------------FLASH----------------*/ /*------------FLASH----------------*/
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/FISHDRONEF4/target.h
View file

@ -96,8 +96,8 @@
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define USE_FLASHFS #define USE_FLASHFS
#define M25P16_CS_PIN PD2 #define FLASH_CS_PIN PD2
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
// *************** SDCARD ***************************** // *************** SDCARD *****************************
#define USE_SDCARD #define USE_SDCARD

4
src/main/target/FURYF3/target.h
View file

@ -93,8 +93,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT

4
src/main/target/FURYF4/target.h
View file

@ -118,8 +118,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_VCP #define USE_VCP
#define USB_DETECT_PIN PC5 #define USB_DETECT_PIN PC5

4
src/main/target/FURYF7/target.h
View file

@ -92,8 +92,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PA15 #define FLASH_CS_PIN PA15
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_VCP #define USE_VCP
#define USE_USB_DETECT #define USE_USB_DETECT

5
src/main/target/IMPULSERCF3/target.h
View file

@ -72,9 +72,8 @@
#define USE_SPI_DEVICE_1 // PA4, 5, 6, 7 #define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
#define M25P16_CS_GPIO GPIOB #define FLASH_CS_PIN PB12
#define M25P16_CS_PIN PB12 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_SPI_INSTANCE SPI2
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

4
src/main/target/IRCFUSIONF3/target.h
View file

@ -72,8 +72,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define USE_ADC #define USE_ADC

4
src/main/target/ISHAPEDF3/target.h
View file

@ -90,8 +90,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define USE_ADC #define USE_ADC

4
src/main/target/KAKUTEF4/target.h
View file

@ -81,8 +81,8 @@
#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD)
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/KIWIF4/target.h
View file

@ -104,8 +104,8 @@
#else #else
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN SPI3_NSS_PIN #define FLASH_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#endif #endif
#define USE_VCP #define USE_VCP

6
src/main/target/LUMBAF3/target.h
View file

@ -34,13 +34,11 @@
#define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_1
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define MPU6000_CS_GPIO GPIOA
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1
#define M25P16_CS_GPIO GPIOB #define FLASH_CS_PIN PB12
#define M25P16_CS_PIN PB12 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/MATEKF405/target.h
View file

@ -99,8 +99,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PC0 #define FLASH_CS_PIN PC0
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
// *************** SD Card ************************** // *************** SD Card **************************
#define USE_SDCARD #define USE_SDCARD

4
src/main/target/MOTOLAB/target.h
View file

@ -87,8 +87,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/MULTIFLITEPICO/target.h
View file

@ -102,8 +102,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
//#define M25P16_CS_PIN PB12 //#define FLASH_CS_PIN PB12
//#define M25P16_SPI_INSTANCE SPI2 //#define FLASH_SPI_INSTANCE SPI2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define USE_ADC #define USE_ADC

4
src/main/target/NAZE/target.h
View file

@ -71,8 +71,8 @@
#define NAZE_SPI_CS_PIN PB12 #define NAZE_SPI_CS_PIN PB12
// We either have this 16mbit flash chip on SPI or the MPU6500 acc/gyro depending on board revision: // We either have this 16mbit flash chip on SPI or the MPU6500 acc/gyro depending on board revision:
#define M25P16_CS_PIN NAZE_SPI_CS_PIN #define FLASH_CS_PIN NAZE_SPI_CS_PIN
#define M25P16_SPI_INSTANCE NAZE_SPI_INSTANCE #define FLASH_SPI_INSTANCE NAZE_SPI_INSTANCE
#define MPU6500_CS_PIN NAZE_SPI_CS_PIN #define MPU6500_CS_PIN NAZE_SPI_CS_PIN
#define MPU6500_SPI_INSTANCE NAZE_SPI_INSTANCE #define MPU6500_SPI_INSTANCE NAZE_SPI_INSTANCE

4
src/main/target/NOX/target.h
View file

@ -101,8 +101,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_SPI_INSTANCE SPI1 #define FLASH_SPI_INSTANCE SPI1
#define M25P16_CS_PIN PA15 #define FLASH_CS_PIN PA15
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define USE_ADC #define USE_ADC

12
src/main/target/OMNIBUSF4/target.h
View file

@ -155,20 +155,20 @@
#define SDCARD_DMA_CHANNEL 0 #define SDCARD_DMA_CHANNEL 0
// For variants with SDcard replaced with flash chip // For variants with SDcard replaced with flash chip
#define M25P16_CS_PIN SDCARD_SPI_CS_PIN #define FLASH_CS_PIN SDCARD_SPI_CS_PIN
#define M25P16_SPI_INSTANCE SDCARD_SPI_INSTANCE #define FLASH_SPI_INSTANCE SDCARD_SPI_INSTANCE
#elif defined(LUXF4OSD) #elif defined(LUXF4OSD)
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#else #else
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define M25P16_CS_PIN SPI3_NSS_PIN #define FLASH_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#endif // OMNIBUSF4 #endif // OMNIBUSF4

4
src/main/target/OMNIBUSF4FW/target.h
View file

@ -91,8 +91,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define USE_VCP #define USE_VCP
#define VBUS_SENSING_PIN PC5 #define VBUS_SENSING_PIN PC5

4
src/main/target/OMNIBUSF7/target.h
View file

@ -198,8 +198,8 @@
#ifdef FPVM_BETAFLIGHTF7 #ifdef FPVM_BETAFLIGHTF7
//FLASH-------------------------------------- //FLASH--------------------------------------
#define M25P16_CS_PIN SPI4_NSS_PIN #define FLASH_CS_PIN SPI4_NSS_PIN
#define M25P16_SPI_INSTANCE SPI4 #define FLASH_SPI_INSTANCE SPI4
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/OMNINXT/target.h
View file

@ -96,8 +96,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_CS_PIN PC14 #define FLASH_CS_PIN PC14
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT

6
src/main/target/RACEBASE/target.h
View file

@ -90,9 +90,9 @@
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_SPI_SHARED #define FLASH_SPI_SHARED
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/REVO/target.h
View file

@ -176,8 +176,8 @@
#else #else
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

6
src/main/target/REVOLT/target.h
View file

@ -106,12 +106,12 @@
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
/*----------Flash Config--------*/ /*----------Flash Config--------*/
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#if defined(REVOLTOSD) #if defined(REVOLTOSD)
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#else #else
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
#endif #endif

5
src/main/target/SINGULARITY/target.h
View file

@ -81,9 +81,8 @@
#define RTC6705_CS_PIN PA4 #define RTC6705_CS_PIN PA4
#define RTC6705_SPI_INSTANCE SPI1 #define RTC6705_SPI_INSTANCE SPI1
#define M25P16_CS_GPIO GPIOB #define FLASH_CS_PIN PB12
#define M25P16_CS_PIN PB12 #define FLASH_SPI_INSTANCE SPI2
#define M25P16_SPI_INSTANCE SPI2
#define USE_ADC #define USE_ADC

4
src/main/target/SPARKY2/target.h
View file

@ -65,8 +65,8 @@
#define USE_BARO_MS5611 #define USE_BARO_MS5611
//#define USE_BARO_BMP280 //#define USE_BARO_BMP280
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
//#define RFM22B_CS_PIN PA15 //#define RFM22B_CS_PIN PA15
//#define RFM22B_SPI_INSTANCE SPI3 //#define RFM22B_SPI_INSTANCE SPI3

4
src/main/target/SPEEDYBEEF4/target.h
View file

@ -78,8 +78,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PC0 #define FLASH_CS_PIN PC0
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
// *************** OSD ***************************** // *************** OSD *****************************
#define USE_SPI_DEVICE_2 #define USE_SPI_DEVICE_2

4
src/main/target/SPEKTRUMF400/target.h
View file

@ -48,8 +48,8 @@
//#define USE_FLASHFS //#define USE_FLASHFS
//#define USE_FLASH_M25P16 //#define USE_FLASH_M25P16
//#define M25P16_CS_PIN PB12 //#define FLASH_CS_PIN PB12
//#define M25P16_SPI_INSTANCE SPI2 //#define FLASH_SPI_INSTANCE SPI2
#define USE_GYRO #define USE_GYRO
#define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_MPU6500

4
src/main/target/SPRACINGF3/target.h
View file

@ -163,8 +163,8 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

4
src/main/target/STM32F3DISCOVERY/target.h
View file

@ -69,8 +69,8 @@
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
// SPI1 // SPI1
// PB5 SPI1_MOSI // PB5 SPI1_MOSI
// PB4 SPI1_MISO // PB4 SPI1_MISO

4
src/main/target/TINYFISH/target.h
View file

@ -90,8 +90,8 @@
#define SPI2_MISO_PIN PB14 #define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15 #define SPI2_MOSI_PIN PB15
#define M25P16_CS_PIN SPI2_NSS_PIN #define FLASH_CS_PIN SPI2_NSS_PIN
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16

4
src/main/target/VRRACE/target.h
View file

@ -87,8 +87,8 @@
/* /*
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN PB3 #define FLASH_CS_PIN PB3
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
*/ */
#define USE_VCP #define USE_VCP

4
src/main/target/X_RACERSPI/target.h
View file

@ -97,8 +97,8 @@
#define SPI2_MISO_PIN PB14 #define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15 #define SPI2_MOSI_PIN PB15
#define M25P16_CS_PIN PB12 #define FLASH_CS_PIN PB12
#define M25P16_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define USE_ADC #define USE_ADC

4
src/main/target/YUPIF7/target.h
View file

@ -113,8 +113,8 @@
// Dataflash // Dataflash
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN SPI3_NSS_PIN #define FLASH_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_INSTANCE SPI3 #define FLASH_SPI_INSTANCE SPI3
// ADC inputs // ADC inputs
#define USE_ADC #define USE_ADC