some bugfixes

bsp_q7s/core/CoreController.cpp

@@ -142,7 +142,7 @@ ReturnValue_t CoreController::initialize() {
 
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
   ReturnValue_t result = returnvalue::OK;
-  auto sdCard =   sdcMan->setActiveSdCard(sdInfo.pref);
+  auto sdCard = sdcMan->getPreferredSdCard();
   if (not sdCard) {
     return returnvalue::FAILED;
   }
@@ -436,16 +436,10 @@ ReturnValue_t CoreController::sdStateMachine() {
       sdInfo.commandExecuted = true;
     } else {
       if (nonBlockingOpChecking(SdStates::DETERMINE_OTHER, 5, "Mounting SD card")) {
-<<<<<<< HEAD
-        sdInfo.prefState = sd::SdState::MOUNTED;
-        currentStateSetter(sdInfo.pref, sd::SdState::MOUNTED);
-        sdcMan->setActiveSdCard(sdInfo.pref);
-=======
         sdcMan->setActiveSdCard(sdInfo.active);
         currMntPrefix = sdcMan->getCurrentMountPrefix();
         sdInfo.activeState = sd::SdState::MOUNTED;
         currentStateSetter(sdInfo.active, sd::SdState::MOUNTED);
->>>>>>> origin/develop
       }
     }
   }
@@ -1882,11 +1876,11 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
     sourceStr = "tmp directory";
   }
   bool sameChipAndCopy = false;
-  if(chip == CURRENT_CHIP and copy == CURRENT_COPY) {
+  if (chip == CURRENT_CHIP and copy == CURRENT_COPY) {
     // This is problematic if the OBSW is running as a systemd service.
     // Do not allow for now.
     return HasActionsIF::INVALID_PARAMETERS;
-    //sameChipAndCopy = true;
+    // sameChipAndCopy = true;
   }
   sif::info << "Executing SW update for Chip " << static_cast<int>(data[0]) << " Copy "
             << static_cast<int>(data[1]) << " from " << sourceStr << std::endl;
@@ -1922,7 +1916,7 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
   cmd.clear();
   path obswDestPath;
   path obswVersionDestPath;
-  if(not sameChipAndCopy) {
+  if (not sameChipAndCopy) {
     cmd << "xsc_mount_copy " << std::to_string(data[0]) << " " << std::to_string(data[1]);
     result = system(cmd.str().c_str());
     if (result != 0) {

bsp_q7s/core/InitMission.cpp

@@ -532,7 +532,6 @@ void initmission::createTestTasks(TaskFactory& factory,
 #endif  // OBSW_ADD_TEST_TASK == 1 && OBSW_ADD_TEST_CODE == 1
 }
 
-
 /**
                    ▄              ▄
                   ▌▒█           ▄▀▒▌

bsp_q7s/fs/SdCardManager.cpp

@@ -553,9 +553,9 @@ void SdCardManager::setActiveSdCard(sd::SdCard sdCard) {
   MutexGuard mg(mutex);
   sdInfo.active = sdCard;
   if (sdInfo.active == sd::SdCard::SLOT_0) {
-    currentPrefix = SD_0_MOUNT_POINT;
+    currentPrefix = config::SD_0_MOUNT_POINT;
   } else {
-    currentPrefix = SD_1_MOUNT_POINT;
+    currentPrefix = config::SD_1_MOUNT_POINT;
   }
 }