eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 119 Wiki Activity

Merge branch 'mueller/non-blocking-sd-card-init' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2021-08-08 12:43:17 +02:00
commit 106228c2ee
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bsp_q7s/core/CoreController.cpp
View File

@ -38,10 +38,11 @@ CoreController::CoreController(object_id_t objectId):
if(sdcMan == nullptr) {
sif::error << "CoreController::CoreController: SD card manager invalid!" << std::endl;
}
if(not BLOCKING_SD_INIT) {
sdStateMachine();
sdcMan->setBlocking(false);
}
sdStateMachine();
result = initBootCopy();
if(result != HasReturnvaluesIF::RETURN_OK) {
@ -59,7 +60,7 @@ ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) {
}
void CoreController::performControlOperation() {
if(not BLOCKING_SD_INIT and not sdInfo.initFinished) {
if(not BLOCKING_SD_INIT) {
sdStateMachine();
}
performWatchdogControlOperation();
@ -83,9 +84,8 @@ ReturnValue_t CoreController::initialize() {
"count failed" << std::endl;
}
if(not BLOCKING_SD_INIT) {
sdStateMachine();
}
sdStateMachine();
return ExtendedControllerBase::initialize();
}
@ -146,9 +146,17 @@ ReturnValue_t CoreController::sdStateMachine() {
if(sdInfo.state == SdStates::START) {
#if Q7S_SD_CARD_CONFIG == Q7S_SD_NONE
sif::info << "No SD card initialization will be performed" << std::endl;
sdInfo.state == SdStates::IDLE;
sdInfo.state = SdStates::IDLE;
sdInfo.initFinished = true;
return result;
#else
// Init will be performed by separate function
if(not BLOCKING_SD_INIT) {
sdInfo.state = SdStates::IDLE;
sdInfo.initFinished = true;
return result;
}
#endif
sdInfo.cycleCount = 0;
sdInfo.commandExecuted = false;
sdInfo.state = SdStates::GET_INFO;