Filesystem Update #53

Merged
meierj merged 17 commits from mueller/filesystem-update into develop 2021-07-22 09:03:43 +02:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit ed772665d5 - Show all commits

View File

@ -40,7 +40,7 @@ ReturnValue_t CoreController::initialize() {
sif::info << "Switching on SD card " << printoutString << ".." << std::endl; sif::info << "Switching on SD card " << printoutString << ".." << std::endl;
result = SdCardManager::instance()->switchOnSdCard(preferredSdCard); result = SdCardManager::instance()->switchOnSdCard(preferredSdCard, true);
if(result == SdCardManager::ALREADY_ON) { if(result == SdCardManager::ALREADY_ON) {
sif::info << "SD card " << printoutString << " is already on" << std::endl; sif::info << "SD card " << printoutString << " is already on" << std::endl;
} }

View File

@ -262,7 +262,7 @@ void SdCardManager::setPreferredSdCard(sd::SdCard sdCard) {
ReturnValue_t SdCardManager::updateSdCardStateFile() { ReturnValue_t SdCardManager::updateSdCardStateFile() {
// Use q7hw utility and pipe the command output into the state file // Use q7hw utility and pipe the command output into the state file
std::string updateCmd = "q7hw sd info all > " + SD_STATE_FILE; std::string updateCmd = "q7hw sd info all > " + std::string(SD_STATE_FILE);
int result = std::system(updateCmd.c_str()); int result = std::system(updateCmd.c_str());
if(result == 0) { if(result == 0) {
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;