diff --git a/src/config/AIRBOTF4SD/config.h b/src/config/AIRBOTF4SD/config.h index 8c49e75309..3d855b931b 100644 --- a/src/config/AIRBOTF4SD/config.h +++ b/src/config/AIRBOTF4SD/config.h @@ -110,7 +110,7 @@ #define BARO_SPI_INSTANCE SPI1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/ALIENFLIGHTF4/config.h b/src/config/ALIENFLIGHTF4/config.h index f4347eafa5..88fc49714c 100644 --- a/src/config/ALIENFLIGHTF4/config.h +++ b/src/config/ALIENFLIGHTF4/config.h @@ -117,7 +117,7 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI2 diff --git a/src/config/ALIENFLIGHTNGF7/config.h b/src/config/ALIENFLIGHTNGF7/config.h index a14e083d2f..3bf585689f 100644 --- a/src/config/ALIENFLIGHTNGF7/config.h +++ b/src/config/ALIENFLIGHTNGF7/config.h @@ -116,7 +116,7 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/ALIENFLIGHTNGF7_DUAL/config.h b/src/config/ALIENFLIGHTNGF7_DUAL/config.h index f630d0416c..d943ae8765 100644 --- a/src/config/ALIENFLIGHTNGF7_DUAL/config.h +++ b/src/config/ALIENFLIGHTNGF7_DUAL/config.h @@ -103,7 +103,7 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/ALIENFLIGHTNGF7_ELRS/config.h b/src/config/ALIENFLIGHTNGF7_ELRS/config.h index 6a70bf1e4c..dd3402ae48 100644 --- a/src/config/ALIENFLIGHTNGF7_ELRS/config.h +++ b/src/config/ALIENFLIGHTNGF7_ELRS/config.h @@ -117,7 +117,7 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/ALIENFLIGHTNGF7_RX/config.h b/src/config/ALIENFLIGHTNGF7_RX/config.h index 812c2401eb..7c3522a47b 100644 --- a/src/config/ALIENFLIGHTNGF7_RX/config.h +++ b/src/config/ALIENFLIGHTNGF7_RX/config.h @@ -105,7 +105,7 @@ #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/ANYFCF7/config.h b/src/config/ANYFCF7/config.h index a5004fc53a..d6a33ca113 100644 --- a/src/config/ANYFCF7/config.h +++ b/src/config/ANYFCF7/config.h @@ -121,7 +121,7 @@ #define BARO_I2C_INSTANCE (I2CDEV_2) #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/BEEROTORF4/config.h b/src/config/BEEROTORF4/config.h index c0259bd3ed..2bb985fbcb 100644 --- a/src/config/BEEROTORF4/config.h +++ b/src/config/BEEROTORF4/config.h @@ -101,7 +101,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/BETAFPVF405/config.h b/src/config/BETAFPVF405/config.h index 35343cce08..40a2c04637 100644 --- a/src/config/BETAFPVF405/config.h +++ b/src/config/BETAFPVF405/config.h @@ -115,7 +115,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED //TODO #define YAW_MOTORS_REVERSED ON -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/BLUEJAYF4/config.h b/src/config/BLUEJAYF4/config.h index 0beded9c58..fa48bf0653 100644 --- a/src/config/BLUEJAYF4/config.h +++ b/src/config/BLUEJAYF4/config.h @@ -91,7 +91,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/CLRACINGF7/config.h b/src/config/CLRACINGF7/config.h index 83dbc73eac..59ec065084 100644 --- a/src/config/CLRACINGF7/config.h +++ b/src/config/CLRACINGF7/config.h @@ -118,7 +118,7 @@ #define DEFAULT_CURRENT_METER_SCALE 250 #define BEEPER_INVERTED //TODO #define PID_PROCESS_DENOM 1 -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/FISHDRONEF4/config.h b/src/config/FISHDRONEF4/config.h index 96f16ba1b9..d5e1be0722 100644 --- a/src/config/FISHDRONEF4/config.h +++ b/src/config/FISHDRONEF4/config.h @@ -87,7 +87,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/FRSKYF4/config.h b/src/config/FRSKYF4/config.h index 8ecc0a2322..80924483d6 100644 --- a/src/config/FRSKYF4/config.h +++ b/src/config/FRSKYF4/config.h @@ -101,7 +101,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/FURYF4/config.h b/src/config/FURYF4/config.h index 0aad0bdc2a..413dd16b8e 100644 --- a/src/config/FURYF4/config.h +++ b/src/config/FURYF4/config.h @@ -96,7 +96,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/HGLRCF745/config.h b/src/config/HGLRCF745/config.h index 381e0ace24..12e3b21b12 100644 --- a/src/config/HGLRCF745/config.h +++ b/src/config/HGLRCF745/config.h @@ -120,7 +120,7 @@ #define DEFAULT_CURRENT_METER_SCALE 400 #define BEEPER_INVERTED #define BEEPER_PWM_HZ 0 -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 //TODO #define MAX7456_CLOCK NOMINAL diff --git a/src/config/HOBBYWING_XROTORF4G3/config.h b/src/config/HOBBYWING_XROTORF4G3/config.h index 218faced52..81179178d9 100644 --- a/src/config/HOBBYWING_XROTORF4G3/config.h +++ b/src/config/HOBBYWING_XROTORF4G3/config.h @@ -112,7 +112,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/JBF7_V2/config.h b/src/config/JBF7_V2/config.h index a5a2f3353f..3dc57e14cb 100644 --- a/src/config/JBF7_V2/config.h +++ b/src/config/JBF7_V2/config.h @@ -105,7 +105,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 200 #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 //TODO #define OSD_VBAT_POS 2433 diff --git a/src/config/KAKUTEF7/config.h b/src/config/KAKUTEF7/config.h index 88059bcd50..9a427d15b6 100644 --- a/src/config/KAKUTEF7/config.h +++ b/src/config/KAKUTEF7/config.h @@ -103,7 +103,7 @@ #define DEFAULT_CURRENT_METER_SCALE 275 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/config/KAKUTEF7HDV/config.h b/src/config/KAKUTEF7HDV/config.h index 25481762bd..1b2b8149df 100644 --- a/src/config/KAKUTEF7HDV/config.h +++ b/src/config/KAKUTEF7HDV/config.h @@ -102,7 +102,7 @@ #define DEFAULT_CURRENT_METER_SCALE 275 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI1 #define DASHBOARD_I2C_INSTANCE (I2CDEV_1) diff --git a/src/config/KAKUTEF7V2/config.h b/src/config/KAKUTEF7V2/config.h index 16c1361ca0..14c980bdce 100644 --- a/src/config/KAKUTEF7V2/config.h +++ b/src/config/KAKUTEF7V2/config.h @@ -101,7 +101,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/config/KAKUTEH7/config.h b/src/config/KAKUTEH7/config.h index a150b0ff1b..9fa802dadf 100644 --- a/src/config/KAKUTEH7/config.h +++ b/src/config/KAKUTEH7/config.h @@ -113,7 +113,7 @@ #define DEFAULT_VOLTAGE_METER_SCALE 109 #define DEFAULT_CURRENT_METER_SCALE 168 #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI1 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/config/KROOZX/config.h b/src/config/KROOZX/config.h index 2a8a93fc9f..8a3628087d 100644 --- a/src/config/KROOZX/config.h +++ b/src/config/KROOZX/config.h @@ -102,7 +102,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 1000 -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 16 diff --git a/src/config/MLTEMPF4/config.h b/src/config/MLTEMPF4/config.h index 9c93a1336c..f086ac5244 100644 --- a/src/config/MLTEMPF4/config.h +++ b/src/config/MLTEMPF4/config.h @@ -87,7 +87,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 140 #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/MLTYPHF4/config.h b/src/config/MLTYPHF4/config.h index bf16e1cabd..c569cf8463 100644 --- a/src/config/MLTYPHF4/config.h +++ b/src/config/MLTYPHF4/config.h @@ -87,7 +87,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 140 #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/NERO/config.h b/src/config/NERO/config.h index c35aa0ce16..f7a568549b 100644 --- a/src/config/NERO/config.h +++ b/src/config/NERO/config.h @@ -86,7 +86,7 @@ #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW0_DEG -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/src/config/OMNIBUSF4SD/config.h b/src/config/OMNIBUSF4SD/config.h index 60dd7d2b11..5cb14cd99c 100644 --- a/src/config/OMNIBUSF4SD/config.h +++ b/src/config/OMNIBUSF4SD/config.h @@ -119,7 +119,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/OMNIBUSF7/config.h b/src/config/OMNIBUSF7/config.h index 8eacef2f21..d65db76bff 100644 --- a/src/config/OMNIBUSF7/config.h +++ b/src/config/OMNIBUSF7/config.h @@ -104,7 +104,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/config/OMNIBUSF7V2/config.h b/src/config/OMNIBUSF7V2/config.h index 0884248986..504b586bca 100644 --- a/src/config/OMNIBUSF7V2/config.h +++ b/src/config/OMNIBUSF7V2/config.h @@ -104,7 +104,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI4 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/config/SPRACINGF4EVO/config.h b/src/config/SPRACINGF4EVO/config.h index 557afb6647..6994378a52 100644 --- a/src/config/SPRACINGF4EVO/config.h +++ b/src/config/SPRACINGF4EVO/config.h @@ -114,7 +114,7 @@ #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/SPRACINGF4NEO/config.h b/src/config/SPRACINGF4NEO/config.h index 99aa7faf6e..32a0588caf 100644 --- a/src/config/SPRACINGF4NEO/config.h +++ b/src/config/SPRACINGF4NEO/config.h @@ -117,7 +117,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 300 #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/STACKX/config.h b/src/config/STACKX/config.h index 4bf018b772..e5bc49cba7 100644 --- a/src/config/STACKX/config.h +++ b/src/config/STACKX/config.h @@ -89,7 +89,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 diff --git a/src/config/WIZZF7HD/config.h b/src/config/WIZZF7HD/config.h index a1e55db935..34cf628da5 100644 --- a/src/config/WIZZF7HD/config.h +++ b/src/config/WIZZF7HD/config.h @@ -101,7 +101,7 @@ #define DEFAULT_CURRENT_METER_SCALE 250 #define BEEPER_INVERTED //TODO #define PID_PROCESS_DENOM 1 -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI3 diff --git a/src/config/YUPIF4/config.h b/src/config/YUPIF4/config.h index dc1813ff5e..5bf0fefb18 100644 --- a/src/config/YUPIF4/config.h +++ b/src/config/YUPIF4/config.h @@ -95,7 +95,7 @@ #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 150 -//TODO #define SDCARD_DETECT_INVERTED ON +#define SDCARD_DETECT_INVERTED #define USE_SDCARD_SPI #define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 diff --git a/src/main/pg/sdcard.c b/src/main/pg/sdcard.c index 292203cb8f..a2a201a877 100644 --- a/src/main/pg/sdcard.c +++ b/src/main/pg/sdcard.c @@ -35,6 +35,25 @@ #include "drivers/dma.h" #include "drivers/dma_reqmap.h" +#ifdef USE_SDCARD_SPI +#ifndef SDCARD_SPI_INSTANCE +#define SDCARD_SPI_INSTANCE NULL +#endif +#ifndef SDCARD_SPI_CS_PIN +#define SDCARD_SPI_CS_PIN NONE +#endif +#endif // USE_SDCARD_SPI + +#ifndef SDCARD_DETECT_PIN +#define SDCARD_DETECT_PIN NONE +#endif + +#ifdef SDCARD_DETECT_INVERTED +#define SDCARD_DETECT_IS_INVERTED 1 +#else +#define SDCARD_DETECT_IS_INVERTED 0 +#endif + PG_REGISTER_WITH_RESET_FN(sdcardConfig_t, sdcardConfig, PG_SDCARD_CONFIG, 2); void pgResetFn_sdcardConfig(sdcardConfig_t *config) @@ -73,7 +92,7 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config) } #endif -#if defined(USE_SDCARD_SDIO) +#if defined(USE_SDCARD_SDIO) && defined(SDIO_DEVICE) if (SDIO_DEVICE != SDIOINVALID) { config->mode = SDCARD_MODE_SDIO; } diff --git a/src/main/pg/sdio.c b/src/main/pg/sdio.c index 70ec8c2aec..a8b5b4894f 100644 --- a/src/main/pg/sdio.c +++ b/src/main/pg/sdio.c @@ -27,6 +27,37 @@ #include "pg/pg_ids.h" #include "pg/sdio.h" +#ifndef SDCARD_SDIO_DMA_OPT +#define SDCARD_SDIO_DMA_OPT (DMA_OPT_UNUSED) +#endif + +#ifndef SDIO_DEVICE +#define SDIO_DEVICE SDIOINVALID +#endif + +#ifndef SDIO_USE_4BIT +#define SDIO_USE_4BIT false +#endif +#ifndef SDIO_CK_PIN +#define SDIO_CK_PIN NONE +#endif +#ifndef SDIO_CMD_PIN +#define SDIO_CMD_PIN NONE +#endif +#ifndef SDIO_D0_PIN +#define SDIO_D0_PIN NONE +#endif +#ifndef SDIO_D1_PIN +#define SDIO_D1_PIN NONE +#endif +#ifndef SDIO_D2_PIN +#define SDIO_D2_PIN NONE +#endif +#ifndef SDIO_D3_PIN +#define SDIO_D3_PIN NONE +#endif + + PG_REGISTER_WITH_RESET_TEMPLATE(sdioConfig_t, sdioConfig, PG_SDIO_CONFIG, 0); PG_RESET_TEMPLATE(sdioConfig_t, sdioConfig, diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h index 19e1042dc1..fb56828839 100644 --- a/src/main/target/common_defaults_post.h +++ b/src/main/target/common_defaults_post.h @@ -144,54 +144,6 @@ #endif #endif -#ifdef USE_SDCARD -#ifndef SDCARD_DETECT_PIN -#define SDCARD_DETECT_PIN NONE -#endif -#ifdef SDCARD_DETECT_INVERTED -#define SDCARD_DETECT_IS_INVERTED 1 -#else -#define SDCARD_DETECT_IS_INVERTED 0 -#endif -#ifdef USE_SDCARD_SPI -#ifndef SDCARD_SPI_INSTANCE -#define SDCARD_SPI_INSTANCE NULL -#endif -#ifndef SDCARD_SPI_CS_PIN -#define SDCARD_SPI_CS_PIN NONE -#endif -#endif // USE_SDCARD_SPI -#ifdef USE_SDCARD_SDIO -#ifndef SDCARD_SDIO_DMA_OPT -#define SDCARD_SDIO_DMA_OPT (DMA_OPT_UNUSED) -#endif -#ifndef SDIO_DEVICE -#define SDIO_DEVICE SDIOINVALID -#endif -#ifndef SDIO_USE_4BIT -#define SDIO_USE_4BIT false -#endif -#ifndef SDIO_CK_PIN -#define SDIO_CK_PIN NONE -#endif -#ifndef SDIO_CMD_PIN -#define SDIO_CMD_PIN NONE -#endif -#ifndef SDIO_D0_PIN -#define SDIO_D0_PIN NONE -#endif -#ifndef SDIO_D1_PIN -#define SDIO_D1_PIN NONE -#endif -#ifndef SDIO_D2_PIN -#define SDIO_D2_PIN NONE -#endif -#ifndef SDIO_D3_PIN -#define SDIO_D3_PIN NONE -#endif -#endif // USE_SDCARD_SDIO -#endif // USE_SDCARD - #if defined(USE_UART1) || defined(USE_UART2) || defined(USE_UART3) || defined(USE_UART4) || defined(USE_UART5) || defined(USE_UART6) || defined(USE_UART7) || defined(USE_UART8) #define USE_UART #endif