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

v1.14.0 #304

Merged
muellerr merged 366 commits from develop into main 2022-10-10 17:46:38 +02:00
Conversation 0 Commits 366 Files Changed 420 +3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8c0fd8d9e2 - Show all commits

3
bsp_q7s/core/CoreController.cpp
View File

@ -215,12 +215,14 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
if (not startSdStateMachine(sd::SdCard::SLOT_0, SdCfgMode::COLD_REDUNDANT)) { if (not startSdStateMachine(sd::SdCard::SLOT_0, SdCfgMode::COLD_REDUNDANT)) {
return HasActionsIF::IS_BUSY; return HasActionsIF::IS_BUSY;
} }
// Completion will be reported by SD card state machine
return returnvalue::OK; return returnvalue::OK;
} }
case (SWITCH_TO_SD_1): { case (SWITCH_TO_SD_1): {
if (not startSdStateMachine(sd::SdCard::SLOT_1, SdCfgMode::COLD_REDUNDANT)) { if (not startSdStateMachine(sd::SdCard::SLOT_1, SdCfgMode::COLD_REDUNDANT)) {
return HasActionsIF::IS_BUSY; return HasActionsIF::IS_BUSY;
} }
// Completion will be reported by SD card state machine
return returnvalue::OK; return returnvalue::OK;
} }
case (SWITCH_TO_BOTH_SD_CARDS): { case (SWITCH_TO_BOTH_SD_CARDS): {
@ -236,6 +238,7 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
if (not startSdStateMachine(active, SdCfgMode::HOT_REDUNDANT)) { if (not startSdStateMachine(active, SdCfgMode::HOT_REDUNDANT)) {
return HasActionsIF::IS_BUSY; return HasActionsIF::IS_BUSY;
} }
// Completion will be reported by SD card state machine
return returnvalue::OK; return returnvalue::OK;
} }
case (SWITCH_IMG_LOCK): { case (SWITCH_IMG_LOCK): {