diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 93df63a7..c4863260 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -4,7 +4,7 @@ #include "../memory/SdCardManager.h" CoreController::CoreController(object_id_t objectId): -ExtendedControllerBase(objectId, objects::NO_OBJECT, 5) { + ExtendedControllerBase(objectId, objects::NO_OBJECT, 5) { } ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) { @@ -82,7 +82,7 @@ ReturnValue_t CoreController::sdCardInit() { sd::SdCard preferredSdCard = sd::SdCard::SLOT_0; result = sdcMan->getPreferredSdCard(preferredSdCard); if(result != HasReturnvaluesIF::RETURN_OK) { - sif::warning << "Could not get prefered SD card information from the scratch buffer" + sif::warning << "Could not get preferred SD card information from the scratch buffer" << std::endl; } std::string preferredString; @@ -92,9 +92,6 @@ ReturnValue_t CoreController::sdCardInit() { std::string otherString; sd::SdCard otherSdc = sd::SdCard::SLOT_0; - sif::info << "Cold redundant SD card configuration, preferred SD card " << - preferredString << std::endl; - if(preferredSdCard == sd::SdCard::SLOT_0) { preferredStatus = sdStatus.first; preferredString = "0"; @@ -110,6 +107,9 @@ ReturnValue_t CoreController::sdCardInit() { otherString = "0"; } + sif::info << "Cold redundant SD card configuration, preferred SD card " << + preferredString << std::endl; + result = setUpSdCard(preferredSdCard, preferredStatus, preferredString); if(result != SdCardManager::ALREADY_MOUNTED and result != HasReturnvaluesIF::RETURN_OK) { sif::warning << "Setting up preferred card " << otherString << diff --git a/bsp_q7s/memory/SdCardAccess.cpp b/bsp_q7s/memory/SdCardAccess.cpp index 92837787..55efde98 100644 --- a/bsp_q7s/memory/SdCardAccess.cpp +++ b/bsp_q7s/memory/SdCardAccess.cpp @@ -2,6 +2,6 @@ #include "fsfw/ipc/MutexGuard.h" -SdCardAccess::SdCardAccess(sd::SdCard sdCard) { +SdCardAccess::SdCardAccess() { } diff --git a/bsp_q7s/memory/SdCardAccess.h b/bsp_q7s/memory/SdCardAccess.h index 8128b122..38dc3336 100644 --- a/bsp_q7s/memory/SdCardAccess.h +++ b/bsp_q7s/memory/SdCardAccess.h @@ -5,7 +5,7 @@ class SdCardAccess { public: - SdCardAccess(sd::SdCard sdCard); + SdCardAccess(); private: }; diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp index b37f1195..36d8f67b 100644 --- a/bsp_q7s/memory/SdCardManager.cpp +++ b/bsp_q7s/memory/SdCardManager.cpp @@ -90,7 +90,7 @@ ReturnValue_t SdCardManager::switchOffSdCard(sd::SdCard sdCard, bool doUnmountSd if(result != HasReturnvaluesIF::RETURN_OK) { return result; } - // Not allowed, this function turns on off SD card + // Not allowed, this function turns off one SD card if(sdCard == sd::SdCard::BOTH) { sif::warning << "SdCardManager::switchOffSdCard: API does not allow sd::SdStatus::BOTH" << std::endl;