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

some more fixes

Browse Source
This commit is contained in:
Robin Müller 2021-07-12 15:58:43 +02:00 committed by Robin Mueller
parent ec2f15cf54
commit 89b6eb8943
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bsp_q7s/core/CoreController.cpp
View File

@ -4,7 +4,7 @@
#include "../memory/SdCardManager.h" #include "../memory/SdCardManager.h"
CoreController::CoreController(object_id_t objectId): CoreController::CoreController(object_id_t objectId):
ExtendedControllerBase(objectId, objects::NO_OBJECT, 5) { ExtendedControllerBase(objectId, objects::NO_OBJECT, 5) {
} }
ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) { ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) {
@ -82,7 +82,7 @@ ReturnValue_t CoreController::sdCardInit() {
sd::SdCard preferredSdCard = sd::SdCard::SLOT_0; sd::SdCard preferredSdCard = sd::SdCard::SLOT_0;
result = sdcMan->getPreferredSdCard(preferredSdCard); result = sdcMan->getPreferredSdCard(preferredSdCard);
if(result != HasReturnvaluesIF::RETURN_OK) { 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::endl;
} }
std::string preferredString; std::string preferredString;
@ -92,9 +92,6 @@ ReturnValue_t CoreController::sdCardInit() {
std::string otherString; std::string otherString;
sd::SdCard otherSdc = sd::SdCard::SLOT_0; 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) { if(preferredSdCard == sd::SdCard::SLOT_0) {
preferredStatus = sdStatus.first; preferredStatus = sdStatus.first;
preferredString = "0"; preferredString = "0";
@ -110,6 +107,9 @@ ReturnValue_t CoreController::sdCardInit() {
otherString = "0"; otherString = "0";
} }
sif::info << "Cold redundant SD card configuration, preferred SD card " <<
preferredString << std::endl;
result = setUpSdCard(preferredSdCard, preferredStatus, preferredString); result = setUpSdCard(preferredSdCard, preferredStatus, preferredString);
if(result != SdCardManager::ALREADY_MOUNTED and result != HasReturnvaluesIF::RETURN_OK) { if(result != SdCardManager::ALREADY_MOUNTED and result != HasReturnvaluesIF::RETURN_OK) {
sif::warning << "Setting up preferred card " << otherString << sif::warning << "Setting up preferred card " << otherString <<

2
bsp_q7s/memory/SdCardAccess.cpp
View File

@ -2,6 +2,6 @@
#include "fsfw/ipc/MutexGuard.h" #include "fsfw/ipc/MutexGuard.h"
SdCardAccess::SdCardAccess(sd::SdCard sdCard) { SdCardAccess::SdCardAccess() {
} }

2
bsp_q7s/memory/SdCardAccess.h
View File

@ -5,7 +5,7 @@
class SdCardAccess { class SdCardAccess {
public: public:
SdCardAccess(sd::SdCard sdCard); SdCardAccess();
private: private:
}; };

2
bsp_q7s/memory/SdCardManager.cpp
View File

@ -90,7 +90,7 @@ ReturnValue_t SdCardManager::switchOffSdCard(sd::SdCard sdCard, bool doUnmountSd
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
return result; 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) { if(sdCard == sd::SdCard::BOTH) {
sif::warning << "SdCardManager::switchOffSdCard: API does not allow sd::SdStatus::BOTH" sif::warning << "SdCardManager::switchOffSdCard: API does not allow sd::SdStatus::BOTH"
<< std::endl; << std::endl;