eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Irini Kosmidou
2022-09-27 17:36:19 +02:00
parent fb3214fef9 e381b00a13
commit a1cc5b0ca7
29 changed files with 357 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bsp_q7s/memory/FileSystemHandler.cpp
View File

@ -72,7 +72,8 @@ void FileSystemHandler::fileSystemCheckup() {
SdCardManager::SdStatePair statusPair;
sdcMan->getSdCardsStatus(statusPair);
auto preferredSdCard = sdcMan->getPreferredSdCard();
if (preferredSdCard and (preferredSdCard == sd::SdCard::SLOT_0) and (statusPair.first == sd::SdState::MOUNTED)) {
if (preferredSdCard and (preferredSdCard == sd::SdCard::SLOT_0) and
(statusPair.first == sd::SdState::MOUNTED)) {
currentMountPrefix = SdCardManager::SD_0_MOUNT_POINT;
} else if ((preferredSdCard == sd::SdCard::SLOT_1) and
(statusPair.second == sd::SdState::MOUNTED)) {
@ -109,7 +110,7 @@ ReturnValue_t FileSystemHandler::initialize() {
}
sdcMan = SdCardManager::instance();
auto sdCard = sdcMan->getPreferredSdCard();
if(not sdCard) {
if (not sdCard) {
return returnvalue::FAILED;
}
sd::SdCard preferredSdCard = sdCard.value();