Merge pull request #5121 from blckmn/sdcard_fix

Fixed error in SDCARD_SPI_CS_PIN define check
This commit is contained in:
Michael Keller 2018-02-08 22:45:46 +13:00 committed by GitHub
commit 0a18daa5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -3220,6 +3220,10 @@ const cliResourceValue_t resourceTable[] = {
#ifdef USE_MAG
{ OWNER_COMPASS_CS, PG_COMPASS_CONFIG, offsetof(compassConfig_t, mag_spi_csn), 0 },
#endif
#ifdef USE_SDCARD
{ OWNER_SDCARD_CS, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, chipSelectTag), 0 },
{ OWNER_SDCARD_DETECT, PG_SDCARD_CONFIG, offsetof(sdcardConfig_t, cardDetectTag), 0 },
#endif
};
static ioTag_t *getIoTag(const cliResourceValue_t value, uint8_t index)

View File

@ -47,7 +47,7 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
#else
config->cardDetectTag = IO_TAG_NONE;
#endif
#ifdef SDCARD_DETECT_PIN
#ifdef SDCARD_SPI_CS_PIN
config->chipSelectTag = IO_TAG(SDCARD_SPI_CS_PIN);
#else
config->chipSelectTag = IO_TAG_NONE;