From d4cfff2e9dc4788c93ad16367aa48604ecac2cf3 Mon Sep 17 00:00:00 2001 From: jflyper Date: Thu, 20 Sep 2018 01:33:12 +0900 Subject: [PATCH] Use unified clock specs, remove per target specs. --- src/main/drivers/accgyro/accgyro_spi_icm20689.c | 4 ++-- src/main/drivers/accgyro/accgyro_spi_mpu6000.c | 6 +++--- src/main/drivers/accgyro/accgyro_spi_mpu9250.c | 4 ++-- src/main/drivers/bus_spi.h | 2 +- src/main/drivers/sdcard.c | 6 ++++++ src/main/target/ALIENFLIGHTF4/target.h | 8 -------- src/main/target/ALIENFLIGHTNGF7/target.h | 8 -------- src/main/target/ANYFCF7/target.h | 6 ------ src/main/target/BEEROTORF4/target.h | 7 ------- src/main/target/BETAFLIGHTF3/target.h | 6 ------ src/main/target/BLUEJAYF4/target.h | 8 -------- src/main/target/CHEBUZZF3/target.h | 6 ------ src/main/target/CLRACINGF4/target.h | 4 ---- src/main/target/CLRACINGF7/target.h | 3 --- src/main/target/F4BY/target.h | 9 --------- src/main/target/FISHDRONEF4/target.h | 8 -------- src/main/target/FRSKYF3/target.h | 4 ---- src/main/target/FRSKYF4/target.h | 3 --- src/main/target/FURYF3/target.h | 7 ------- src/main/target/FURYF4/target.h | 10 ---------- src/main/target/FURYF7/target.h | 6 ------ src/main/target/KAKUTEF7/target.h | 6 ------ src/main/target/KIWIF4/target.h | 10 ---------- src/main/target/KROOZX/target.h | 3 --- src/main/target/LUX_RACE/target.h | 7 ------- src/main/target/MATEKF405/target.h | 7 ------- src/main/target/MATEKF722/target.h | 5 ----- src/main/target/MIDELICF3/target.h | 6 ------ src/main/target/MOTOLABF4/target.h | 5 ----- src/main/target/NERO/target.h | 7 ------- src/main/target/NUCLEOF446RE/target.h | 7 ------- src/main/target/NUCLEOF7/target.h | 6 ------ src/main/target/NUCLEOF722/target.h | 9 +-------- src/main/target/OMNIBUS/target.h | 9 +-------- src/main/target/OMNIBUSF4/target.h | 5 ----- src/main/target/OMNIBUSF7/target.h | 6 ------ src/main/target/REVO/target.h | 6 ------ src/main/target/RG_SSD_F3/target.h | 8 -------- src/main/target/SIRINFPV/target.h | 6 ------ src/main/target/SPRACINGF3EVO/target.h | 7 ------- src/main/target/SPRACINGF3MINI/target.h | 7 ------- src/main/target/SPRACINGF3NEO/target.h | 7 ------- src/main/target/SPRACINGF4EVO/target.h | 7 ------- src/main/target/SPRACINGF4NEO/target.h | 8 -------- src/main/target/SPRACINGF7DUAL/target.h | 7 ------- src/main/target/STM32F3DISCOVERY/target.h | 7 ------- src/main/target/STM32F4DISCOVERY/target.h | 5 ----- src/main/target/STM32F7X2/target.h | 3 --- src/main/target/UAVPNG030MINI/target.h | 5 ----- src/main/target/VRRACE/target.h | 8 -------- src/main/target/WORMFC/target.h | 1 + src/main/target/YUPIF4/target.h | 7 ------- 52 files changed, 17 insertions(+), 305 deletions(-) diff --git a/src/main/drivers/accgyro/accgyro_spi_icm20689.c b/src/main/drivers/accgyro/accgyro_spi_icm20689.c index 22b8a1bfbb..d2b51c43dd 100644 --- a/src/main/drivers/accgyro/accgyro_spi_icm20689.c +++ b/src/main/drivers/accgyro/accgyro_spi_icm20689.c @@ -55,7 +55,7 @@ uint8_t icm20689SpiDetect(const busDevice_t *bus) { icm20689SpiInit(bus); - spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); //low speed + spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); //low speed spiBusWriteRegister(bus, MPU_RA_PWR_MGMT_1, ICM20689_BIT_RESET); @@ -119,7 +119,7 @@ void icm20689GyroInit(gyroDev_t *gyro) { mpuGyroInit(gyro); - spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); + spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); spiBusWriteRegister(&gyro->bus, MPU_RA_PWR_MGMT_1, ICM20689_BIT_RESET); delay(100); diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c index 4dae96384c..65e353ef63 100644 --- a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c +++ b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c @@ -105,7 +105,7 @@ void mpu6000SpiGyroInit(gyroDev_t *gyro) mpu6000AccAndGyroInit(gyro); - spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); + spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); // Accel and Gyro DLPF Setting spiBusWriteRegister(&gyro->bus, MPU6000_CONFIG, mpuGyroDLPF(gyro)); @@ -128,7 +128,7 @@ void mpu6000SpiAccInit(accDev_t *acc) uint8_t mpu6000SpiDetect(const busDevice_t *bus) { - spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); + spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); spiBusWriteRegister(bus, MPU_RA_PWR_MGMT_1, BIT_H_RESET); @@ -175,7 +175,7 @@ static void mpu6000AccAndGyroInit(gyroDev_t *gyro) return; } - spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); + spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); // Device Reset spiBusWriteRegister(&gyro->bus, MPU_RA_PWR_MGMT_1, BIT_H_RESET); diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c index da3e6ce984..ade77ccf25 100644 --- a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c +++ b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c @@ -124,7 +124,7 @@ static void mpu9250AccAndGyroInit(gyroDev_t *gyro) { return; } - spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); //low speed for writing to slow registers + spiSetDivisor(gyro->bus.busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); //low speed for writing to slow registers mpu9250SpiWriteRegister(&gyro->bus, MPU_RA_PWR_MGMT_1, MPU9250_BIT_RESET); delay(50); @@ -152,7 +152,7 @@ static void mpu9250AccAndGyroInit(gyroDev_t *gyro) { uint8_t mpu9250SpiDetect(const busDevice_t *bus) { - spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATON); //low speed + spiSetDivisor(bus->busdev_u.spi.instance, SPI_CLOCK_INITIALIZATION); //low speed mpu9250SpiWriteRegister(bus, MPU_RA_PWR_MGMT_1, MPU9250_BIT_RESET); uint8_t attemptsRemaining = 20; diff --git a/src/main/drivers/bus_spi.h b/src/main/drivers/bus_spi.h index 8f1ef5ed4e..12d8d068a7 100644 --- a/src/main/drivers/bus_spi.h +++ b/src/main/drivers/bus_spi.h @@ -50,7 +50,7 @@ Flash M25p16 tolerates 20mhz, SPI_CLOCK_FAST should sit around 20 or less. */ typedef enum { - SPI_CLOCK_INITIALIZATON = 256, + SPI_CLOCK_INITIALIZATION = 256, #if defined(STM32F4) SPI_CLOCK_SLOW = 128, //00.65625 MHz SPI_CLOCK_STANDARD = 8, //10.50000 MHz diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c index 1664ea22a2..28f8d8a19b 100644 --- a/src/main/drivers/sdcard.c +++ b/src/main/drivers/sdcard.c @@ -50,6 +50,12 @@ #define SDCARD_TIMEOUT_INIT_MILLIS 200 #define SDCARD_MAX_CONSECUTIVE_FAILURES 8 +/* SPI_CLOCK_INITIALIZATION (256) is the slowest (Spec calls for under 400KHz) */ +#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER SPI_CLOCK_INITIALIZATION + +/* Operational speed <= 25MHz */ +#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER SPI_CLOCK_FAST + /* Break up 512-byte SD card sectors into chunks of this size when writing without DMA to reduce the peak overhead * per call to sdcard_poll(). */ diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 4418fd3a4e..f4aa585985 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -68,18 +68,10 @@ #define USE_BARO_BMP280 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PB11 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB10 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 736ddd42a8..95e75b2535 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -82,18 +82,10 @@ #define BMP280_SPI_INSTANCE SPI3 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PB11 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB10 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h index a20055fa13..cca598e7d4 100644 --- a/src/main/target/ANYFCF7/target.h +++ b/src/main/target/ANYFCF7/target.h @@ -137,14 +137,8 @@ #define USE_SDCARD #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PD3 - #define SDCARD_SPI_INSTANCE SPI4 #define SDCARD_SPI_CS_PIN SPI4_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1 #define SDCARD_DMA_CHANNEL 4 diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index d5899bf50c..dda64f290a 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -62,17 +62,10 @@ #define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER #define USE_SDCARD - #define SDCARD_DETECT_PIN PC3 #define SDCARD_DETECT_INVERTED #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index c45d0d269c..f0092f1a50 100644 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -120,16 +120,10 @@ #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index dc84eacce7..1bf34b9087 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -75,18 +75,10 @@ #define MS5611_I2C_INSTANCE I2CDEV_1 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PD2 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PA15 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index 8ba04ea5e6..309b44f0e7 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -46,16 +46,10 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD - #define SDCARD_DETECT_PIN PC14 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index 55897d35c0..46a0561cc4 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -73,10 +73,6 @@ #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h index 2117aaf7b3..df72cfc95e 100644 --- a/src/main/target/CLRACINGF7/target.h +++ b/src/main/target/CLRACINGF7/target.h @@ -68,9 +68,6 @@ #define SDCARD_DETECT_PIN PA8 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz #define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 1ea9f2567b..66b4a364de 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -61,20 +61,11 @@ #define USE_BARO_MS5611 #define USE_SDCARD - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PE15 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream3 #define SDCARD_DMA_CHANNEL 0 - #define USE_VCP #define USE_USB_DETECT #define USB_DETECT_PIN PA9 diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index 70dcf54f15..9e408f62e7 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -106,18 +106,10 @@ // *************** SDCARD ***************************** #define USE_SDCARD - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PB9 - -// SPI3 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index e887c23e33..8d39df2dae 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -127,15 +127,11 @@ #define SPI1_MOSI_PIN PA7 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PB5 #define SDCARD_SPI_INSTANCE SPI1 #define SDCARD_SPI_CS_PIN SPI1_NSS_PIN -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 - #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_NONE diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index 2ecd4d1781..4e7019b832 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -67,9 +67,6 @@ #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index b47db2d9fc..a816cd810b 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -116,18 +116,11 @@ #else #define USE_SDCARD - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PB2 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - // SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: - #define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 - // Divide to under 25MHz for normal operation: - #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 7a8b215e01..ac5c5cb846 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -76,24 +76,14 @@ #define MS5611_I2C_INSTANCE I2CDEV_1 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PD2 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB12 - - // SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: - #define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz - // Divide to under 25MHz for normal operation: - #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - //#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 //#define SDCARD_DMA_CHANNEL 0 - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 - #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #endif diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index 314dcfad96..c141890265 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -80,14 +80,8 @@ #define USE_SDCARD #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PD2 - #define SDCARD_SPI_INSTANCE SPI4 #define SDCARD_SPI_CS_PIN SPI4_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 13.5MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1 #define SDCARD_DMA_CHANNEL 4 diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index 92afef84f8..c89ea6dbfe 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -125,14 +125,8 @@ #define USE_SDCARD #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PD8 - #define SDCARD_SPI_INSTANCE SPI1 #define SDCARD_SPI_CS_PIN SPI1_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz - -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream5 #define SDCARD_DMA_CHANNEL 3 diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index 511d243590..0af6f567d7 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -81,21 +81,11 @@ #if defined(KIWIF4V2) #define USE_SDCARD - - //#define SDCARD_DETECT_PIN PB9 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB12 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - - //#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 //#define SDCARD_DMA_CHANNEL 0 - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index 8c060753b3..cb8d11219b 100644 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -70,9 +70,6 @@ #define SDCARD_DETECT_PIN PC13 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PA15 -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index a17b98ab4f..8b3ba5138d 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -77,18 +77,11 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC13 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 #endif diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h index 7473da108f..0f9c71e7f7 100644 --- a/src/main/target/MATEKF405/target.h +++ b/src/main/target/MATEKF405/target.h @@ -105,15 +105,8 @@ // *************** SD Card ************************** #define USE_SDCARD #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT - #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PC1 - -// SPI3 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream7 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h index bb3379a554..a7a9aff63e 100644 --- a/src/main/target/MATEKF722/target.h +++ b/src/main/target/MATEKF722/target.h @@ -96,11 +96,6 @@ #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PC1 -// SPI3 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream7 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h index 4f649694b7..29436bfc52 100644 --- a/src/main/target/MIDELICF3/target.h +++ b/src/main/target/MIDELICF3/target.h @@ -86,12 +86,6 @@ #define USE_SDCARD #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// // Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 #define USE_ADC diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h index 5a9b391feb..f24373f1fb 100644 --- a/src/main/target/MOTOLABF4/target.h +++ b/src/main/target/MOTOLABF4/target.h @@ -122,11 +122,6 @@ #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB12 #define SDCARD_SPI_CS_CFG IOCFG_OUT_OD -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index 2d72277ac6..e4c00ce619 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -54,17 +54,10 @@ #define GYRO_1_ALIGN CW0_DEG #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PD2 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PA15 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - //#define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream5 //#define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h index b1e65448a3..876780909f 100644 --- a/src/main/target/NUCLEOF446RE/target.h +++ b/src/main/target/NUCLEOF446RE/target.h @@ -73,17 +73,10 @@ #define USE_CMS //#define USE_SDCARD -// //#define SDCARD_SPI_INSTANCE SPI2 //#define SDCARD_SPI_CS_PIN PB12 -//// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -//#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -//// Divide to under 25MHz for normal operation: -//#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 -// //// 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 - // Performance logging for SD card operations: // #define AFATFS_USE_INTROSPECTIVE_LOGGING diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h index 14797f58bc..ee61fc9794 100644 --- a/src/main/target/NUCLEOF7/target.h +++ b/src/main/target/NUCLEOF7/target.h @@ -126,14 +126,8 @@ #define USE_SDCARD #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PF14 - #define SDCARD_SPI_INSTANCE SPI4 #define SDCARD_SPI_CS_PIN SPI4_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1 #define SDCARD_DMA_CHANNEL 4 diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h index 7692c58d54..026438d7c1 100644 --- a/src/main/target/NUCLEOF722/target.h +++ b/src/main/target/NUCLEOF722/target.h @@ -126,21 +126,14 @@ #define SPI4_MOSI_PIN PE14 #define USE_SDCARD - //#define SDCARD_DETECT_INVERTED //#define SDCARD_DETECT_PIN PF14 - //#define SDCARD_SPI_INSTANCE SPI4 //#define SDCARD_SPI_CS_PIN SPI4_NSS_PIN - -//#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -//#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - //#define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1 //#define SDCARD_DMA_CHANNEL 4 - #define USE_SDCARD_SDIO + #define SDIO_DMA DMA2_Stream3 #define SDCARD_SPI_CS_PIN NONE //This is not used on SDIO, has to be kept for now to keep compiler happy diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index c73bf05687..2aa250b620 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -142,19 +142,12 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // DSHOT output 4 uses DMA1_Channel5, so don't use it for the SDCARD until we find an alternative + #ifndef USE_DSHOT #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 #endif diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index ae0b91b786..a0caea9952 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -156,11 +156,6 @@ #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index 2930729243..34c463c85f 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -186,14 +186,8 @@ #define USE_SDCARD #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PE3 - #define SDCARD_SPI_INSTANCE SPI4 #define SDCARD_SPI_CS_PIN SPI4_NSS_PIN - -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 422kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 8 // 27MHz - #define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1 #define SDCARD_DMA_CHANNEL 4 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 5468e6cdf5..bf9bada4c6 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -163,12 +163,6 @@ #define SDCARD_DETECT_PIN PC0 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN SPI3_NSS_PIN - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h index f7f8333cb1..1b29886ef4 100644 --- a/src/main/target/RG_SSD_F3/target.h +++ b/src/main/target/RG_SSD_F3/target.h @@ -69,19 +69,11 @@ #define ENSURE_MPU_DATA_READY_IS_LOW #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI1 #define SDCARD_SPI_CS_GPIO GPIOB #define SDCARD_SPI_CS_PIN SPI1_NSS_PIN - -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - #define SDCARD_DMA_CHANNEL_TX DMA1_Channel3 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index d6b85858d9..bbfb89bb05 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -143,16 +143,10 @@ #define RTC6705_CS_PIN PC14 #define USE_SDCARD - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_GPIO SPI2_GPIO #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index 5fda1f61df..67f4017e1b 100644 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -157,18 +157,11 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index 07434b5171..45a2bf248d 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -179,18 +179,11 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index 68379e44ee..4036625d3e 100644 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -140,18 +140,11 @@ #define SPI_SHARED_MAX7456_AND_RTC6705 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 - // 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 diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index 1d70a1d9f2..db6101ab3e 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -148,17 +148,10 @@ #endif #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -// SPI3 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index 003db8fdef..a4eb780155 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -161,18 +161,10 @@ //#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER #define USE_SDCARD - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 - #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN - -// SPI3 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h index 5535d165c7..f364bccc3f 100644 --- a/src/main/target/SPRACINGF7DUAL/target.h +++ b/src/main/target/SPRACINGF7DUAL/target.h @@ -149,15 +149,8 @@ #define SPI3_MOSI_PIN PB5 #define USE_SDCARD - #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PC3 - -// SPI3 is on the APB1 bus whose clock runs at 54MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 54Mhz/256 = 210kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 54Mhz/3 = 18Mhz // FIXME currently running slower than 18mhz for testing. - #define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream7 #define SDCARD_DMA_CHANNEL DMA_CHANNEL_0 diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index 28087c41a9..e7b54f9a9b 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -158,17 +158,10 @@ //#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN //#define USE_SDCARD -// //#define SDCARD_SPI_INSTANCE SPI2 //#define SDCARD_SPI_CS_PIN PB12 -//// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -//#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -//// Divide to under 25MHz for normal operation: -//#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 -// //// 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 - // Performance logging for SD card operations: // #define AFATFS_USE_INTROSPECTIVE_LOGGING diff --git a/src/main/target/STM32F4DISCOVERY/target.h b/src/main/target/STM32F4DISCOVERY/target.h index f2072b24bc..58c59c9bee 100644 --- a/src/main/target/STM32F4DISCOVERY/target.h +++ b/src/main/target/STM32F4DISCOVERY/target.h @@ -97,11 +97,6 @@ #define USE_SDCARD #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PD8 -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 5,5MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h index 00c683a446..a0b0fadc7b 100644 --- a/src/main/target/STM32F7X2/target.h +++ b/src/main/target/STM32F7X2/target.h @@ -70,9 +70,6 @@ #define USE_SDCARD -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define USE_I2C #define USE_I2C_DEVICE_1 #define USE_I2C_DEVICE_2 diff --git a/src/main/target/UAVPNG030MINI/target.h b/src/main/target/UAVPNG030MINI/target.h index 9b0defe05c..c3711e9edf 100644 --- a/src/main/target/UAVPNG030MINI/target.h +++ b/src/main/target/UAVPNG030MINI/target.h @@ -67,11 +67,6 @@ #define SDCARD_DETECT_PIN PE2 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL DMA_Channel_0 #endif diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index 2aee2e204d..7828b6cfdc 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -55,9 +55,7 @@ #define MS5611_I2C_INSTANCE I2CDEV_1 #define USE_SDCARD - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PD2 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN PB12 @@ -65,20 +63,14 @@ /* #define SDCARD_DETECT_PIN PD2 - #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PB3 */ -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: /* -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz */ -// Divide to under 25MHz for normal operation: /* -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz */ - /* #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 #define SDCARD_DMA_CHANNEL 0 diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h index c29721e22b..78efbafb90 100644 --- a/src/main/target/WORMFC/target.h +++ b/src/main/target/WORMFC/target.h @@ -125,6 +125,7 @@ //SD CARD #define USE_SDCARD #define USE_SDCARD_SDIO + #define SDIO_DMA DMA2_Stream3 #define SDCARD_SPI_CS_PIN NONE //This is not used on SDIO, has to be kept for now to keep compiler happy #define SDCARD_DETECT_PIN PB15 diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h index 6ca501481c..5d066da123 100644 --- a/src/main/target/YUPIF4/target.h +++ b/src/main/target/YUPIF4/target.h @@ -85,16 +85,9 @@ // SD Card #define USE_SDCARD #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PD2 #define SDCARD_SPI_INSTANCE SPI3 #define SDCARD_SPI_CS_PIN PA15 - -// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz - #define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 #define SDCARD_DMA_CHANNEL 0