Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge pull request #6882 from jflyper/bfdev-fix-msp-from-calling-sdcard_getMetadata-when-card-is-not-present

Browse source 
SDCARD: Prevent msp from calling sdcard_getMetadata when card is not ready
This commit is contained in:
Michael Keller 2018-10-06 15:31:19 +13:00 • committed by GitHub
commit ba05be54b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/drivers/sdcard.c
View file

@ -150,7 +150,8 @@ bool sdcard_poll(void)
bool sdcard_isFunctional(void) bool sdcard_isFunctional(void)
{ {
// sdcard_isFunctional is called from multiple places // sdcard_isFunctional is called from multiple places, including the case of hardware implementation
// without a detect pin in which case sdcard_isInserted() always returns true.
if (sdcardVTable) { if (sdcardVTable) {
return sdcardVTable->sdcard_isFunctional(); return sdcardVTable->sdcard_isFunctional();
} else { } else {

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

@ -1999,7 +1999,7 @@ static void cliSdInfo(char *cmdline)
return; return;
} }
if (!sdcard_isInitialized()) { if (!sdcard_isFunctional() || !sdcard_isInitialized()) {
cliPrintLine("Startup failed"); cliPrintLine("Startup failed");
return; return;
} }

5
src/main/interface/msp.c
View file

@ -304,8 +304,13 @@ static void serializeSDCardSummaryReply(sbuf_t *dst)
sbufWriteU8(dst, state); sbufWriteU8(dst, state);
sbufWriteU8(dst, afatfs_getLastError()); sbufWriteU8(dst, afatfs_getLastError());
// Write free space and total space in kilobytes // Write free space and total space in kilobytes
if (state == MSP_SDCARD_STATE_READY) {
sbufWriteU32(dst, afatfs_getContiguousFreeSpace() / 1024); sbufWriteU32(dst, afatfs_getContiguousFreeSpace() / 1024);
sbufWriteU32(dst, sdcard_getMetadata()->numBlocks / 2); // Block size is half a kilobyte sbufWriteU32(dst, sdcard_getMetadata()->numBlocks / 2); // Block size is half a kilobyte
} else {
sbufWriteU32(dst, 0);
sbufWriteU32(dst, 0);
}
#else #else
sbufWriteU8(dst, 0); sbufWriteU8(dst, 0);
sbufWriteU8(dst, 0); sbufWriteU8(dst, 0);