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

FIX CONFIG: SDCARD Inversion (#12478)

Browse source 
* FIX CONFIG: SDCARD Inversion

* Adding check for SDIO_DEVICE being defined
This commit is contained in:
J Blackman 2023-03-09 18:18:10 +11:00 • committed by GitHub
parent 2c71c1fc5b
commit 7434e0134f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 84 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config/AIRBOTF4SD/config.h
View file

@ -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

2
src/config/ALIENFLIGHTF4/config.h
View file

@ -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

2
src/config/ALIENFLIGHTNGF7/config.h
View file

@ -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

2
src/config/ALIENFLIGHTNGF7_DUAL/config.h
View file

@ -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

2
src/config/ALIENFLIGHTNGF7_ELRS/config.h
View file

@ -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

2
src/config/ALIENFLIGHTNGF7_RX/config.h
View file

@ -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

2
src/config/ANYFCF7/config.h
View file

@ -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

2
src/config/BEEROTORF4/config.h
View file

@ -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

2
src/config/BETAFPVF405/config.h
View file

@ -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

2
src/config/BLUEJAYF4/config.h
View file

@ -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

2
src/config/CLRACINGF7/config.h
View file

@ -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

2
src/config/FISHDRONEF4/config.h
View file

@ -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

2
src/config/FRSKYF4/config.h
View file

@ -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

2
src/config/FURYF4/config.h
View file

@ -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

2
src/config/HGLRCF745/config.h
View file

@ -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

2
src/config/HOBBYWING_XROTORF4G3/config.h
View file

@ -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

2
src/config/JBF7_V2/config.h
View file

@ -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

2
src/config/KAKUTEF7/config.h
View file

@ -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

2
src/config/KAKUTEF7HDV/config.h
View file

@ -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)

2
src/config/KAKUTEF7V2/config.h
View file

@ -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

2
src/config/KAKUTEH7/config.h
View file

@ -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

2
src/config/KROOZX/config.h
View file

@ -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

2
src/config/MLTEMPF4/config.h
View file

@ -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

2
src/config/MLTYPHF4/config.h
View file

@ -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

2
src/config/NERO/config.h
View file

@ -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

2
src/config/OMNIBUSF4SD/config.h
View file

@ -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

2
src/config/OMNIBUSF7/config.h
View file

@ -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

2
src/config/OMNIBUSF7V2/config.h
View file

@ -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

2
src/config/SPRACINGF4EVO/config.h
View file

@ -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

2
src/config/SPRACINGF4NEO/config.h
View file

@ -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

2
src/config/STACKX/config.h
View file

@ -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

2
src/config/WIZZF7HD/config.h
View file

@ -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

2
src/config/YUPIF4/config.h
View file

@ -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

21
src/main/pg/sdcard.c
View file

@ -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;
}

31
src/main/pg/sdio.c
View file

@ -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,

48
src/main/target/common_defaults_post.h
View file

@ -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