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

Prepare SD card SPI and SDIO variants for consolidation

Browse source
This commit is contained in:
jflyper 2018-09-27 23:42:06 +09:00
parent 8980ba1065
commit 00840ce40f
109 changed files with 1397 additions and 1262 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/interface/cli.c
View file

@ -3816,7 +3816,7 @@ const cliResourceValue_t resourceTable[] = {
DEFS( OWNER_COMPASS_EXTI, PG_COMPASS_CONFIG, compassConfig_t, interruptTag ),
#endif
#endif
#ifdef USE_SDCARD
#ifdef USE_SDCARD_SPI
DEFS( OWNER_SDCARD_CS, PG_SDCARD_CONFIG, sdcardConfig_t, chipSelectTag ),
DEFS( OWNER_SDCARD_DETECT, PG_SDCARD_CONFIG, sdcardConfig_t, cardDetectTag ),
#endif

14
src/main/interface/settings.c
View file

@ -393,6 +393,12 @@ static const char * const lookupTableVtxLowPowerDisarm[] = {
};
#endif
#ifdef USE_SDCARD
static const char * const lookupTableSdcardMode[] = {
"OFF", "SPI", "SDIO"
};
#endif
#define LOOKUP_TABLE_ENTRY(name) { name, ARRAYLEN(name) }
const lookupTableEntry_t lookupTables[] = {
@ -490,6 +496,9 @@ const lookupTableEntry_t lookupTables[] = {
LOOKUP_TABLE_ENTRY(lookupTableVtxLowPowerDisarm),
#endif
LOOKUP_TABLE_ENTRY(lookupTableGyroHardware),
#ifdef USE_SDCARD
LOOKUP_TABLE_ENTRY(lookupTableSdcardMode),
#endif
};
#undef LOOKUP_TABLE_ENTRY
@ -933,7 +942,12 @@ const clivalue_t valueTable[] = {
// PG_SDCARD_CONFIG
#ifdef USE_SDCARD
{ "sdcard_detect_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, cardDetectInverted) },
{ "sdcard_mode", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_SDCARD_MODE }, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, mode) },
#endif
#ifdef USE_SDCARD_SPI
{ "sdcard_dma", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, useDma) },
{ "sdcard_spi_bus", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, SPIDEV_COUNT }, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, device) },
#endif
#ifdef USE_SDCARD_SDIO
{ "sdio_clk_bypass", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SDIO_CONFIG, offsetof(sdioConfig_t, clockBypass) },

3
src/main/interface/settings.h
View file

@ -120,6 +120,9 @@ typedef enum {
TABLE_VTX_LOW_POWER_DISARM,
#endif
TABLE_GYRO_HARDWARE,
#ifdef USE_SDCARD
TABLE_SDCARD_MODE,
#endif
LOOKUP_TABLE_COUNT
} lookupTableIndex_e;