From 7ca18b52ca0da2f3e5079e74d51ae45e9372e83e Mon Sep 17 00:00:00 2001 From: blckmn Date: Wed, 13 Jul 2016 19:39:03 +1000 Subject: [PATCH 1/3] Added sdcard not present check --- src/main/drivers/sdcard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c index 3813fed74b..7e0b6f5a91 100644 --- a/src/main/drivers/sdcard.c +++ b/src/main/drivers/sdcard.c @@ -192,6 +192,11 @@ static void sdcard_deselect(void) */ static void sdcard_reset(void) { + if (!sdcard_isInserted()) { + sdcard.state = SDCARD_STATE_NOT_PRESENT; + return; + } + if (sdcard.state >= SDCARD_STATE_READY) { spiSetDivisor(SDCARD_SPI_INSTANCE, SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER); } From 7f4a02b73570e0a0f17acd50dd8110eb131f03d5 Mon Sep 17 00:00:00 2001 From: blckmn Date: Wed, 13 Jul 2016 19:42:08 +1000 Subject: [PATCH 2/3] tabs to spaces --- src/main/drivers/sdcard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c index 7e0b6f5a91..a81af703ff 100644 --- a/src/main/drivers/sdcard.c +++ b/src/main/drivers/sdcard.c @@ -193,8 +193,8 @@ static void sdcard_deselect(void) static void sdcard_reset(void) { if (!sdcard_isInserted()) { - sdcard.state = SDCARD_STATE_NOT_PRESENT; - return; + sdcard.state = SDCARD_STATE_NOT_PRESENT; + return; } if (sdcard.state >= SDCARD_STATE_READY) { From f6794f926ed5f720ad4616f54c11ad40f0b28b34 Mon Sep 17 00:00:00 2001 From: blckmn Date: Thu, 14 Jul 2016 17:27:04 +1000 Subject: [PATCH 3/3] Added SD Card output to the status command if applicable to target --- src/main/io/serial_cli.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index c0f3a8c417..283f905c09 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -2904,6 +2904,10 @@ static void cliStatus(char *cmdline) #endif cliPrintf("Cycle Time: %d, I2C Errors: %d, config size: %d\r\n", cycleTime, i2cErrorCounter, sizeof(master_t)); + +#ifdef USE_SDCARD + cliSdInfo(NULL); +#endif } #ifndef SKIP_TASK_STATISTICS