Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-11 17:13:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: try to mount microSD after boot

Browse Source
This commit is contained in:
Andrew Tridgell 2018-12-29 11:08:13 +11:00
parent cf85f25adc
commit 99d0f7a77d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_HAL_ChibiOS/Scheduler.cpp
View File

@ -364,6 +364,7 @@ void Scheduler::_io_thread(void* arg)
uint32_t now = AP_HAL::millis();
if (now - last_sd_start_ms > 3000) {
sdcard_retry();
last_sd_start_ms = now;
}
}
}

12
libraries/AP_HAL_ChibiOS/sdcard.cpp
View File

@ -18,14 +18,14 @@
#include "sdcard.h"
#include "hwdef/common/spi_hook.h"
#include <AP_BoardConfig/AP_BoardConfig.h>
#include <AP_Common/Semaphore.h>
#include "Semaphores.h"
extern const AP_HAL::HAL& hal;
#ifdef USE_POSIX
static FATFS SDC_FS; // FATFS object
static bool sdcard_running;
static HAL_Semaphore sem;
static ChibiOS::Semaphore sem;
#endif
#if HAL_USE_SDC
@ -50,7 +50,7 @@ static SPIConfig highspeed;
bool sdcard_init()
{
#ifdef USE_POSIX
WITH_SEMAPHORE(sem);
sem.take(HAL_SEMAPHORE_BLOCK_FOREVER);
uint8_t sd_slowdown = AP_BoardConfig::get_sdcard_slowdown();
#if HAL_USE_SDC
@ -80,7 +80,9 @@ bool sdcard_init()
// Create APM Directory if needed
mkdir("/APM", 0777);
mkdir("/APM/LOGS", 0777);
sdcard_running = true;
sem.give();
return true;
}
#elif HAL_USE_MMC_SPI
@ -93,6 +95,7 @@ bool sdcard_init()
device = AP_HAL::get_HAL().spi->get_device("sdcard");
if (!device) {
printf("No sdcard SPI device found\n");
sem.give();
return false;
}
device->set_slowdown(sd_slowdown);
@ -124,10 +127,13 @@ bool sdcard_init()
// Create APM Directory if needed
mkdir("/APM", 0777);
mkdir("/APM/LOGS", 0777);
sem.give();
return true;
}
sdcard_running = false;
#endif
sem.give();
#endif
return false;
}