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

v1.6.0 #78

Merged
muellerr merged 147 commits from develop into main 2021-08-09 16:08:26 +02:00
Conversation 0 Commits 147 Files Changed 127 +44 -30
2 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c0ea5cbb1 - Show all commits

58
bsp_q7s/core/CoreController.cpp
View File

@ -123,8 +123,8 @@ ReturnValue_t CoreController::initSdCardBlocking() {
return result; return result;
#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT #elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
sif::info << "Hot redundant SD card configuration" << std::endl; sif::info << "Hot redundant SD card configuration" << std::endl;
sdCardSetup(statusPair, sd::SdCard::SLOT_0, "0"); sdCardSetup(sd::SdCard::SLOT_0, sd::SdState::MOUNTED, "0", false);
sdCardSetup(statusPair, sd::SdCard::SLOT_1, "1"); sdCardSetup(sd::SdCard::SLOT_1, sd::SdState::MOUNTED, "1", false);
// Update status file // Update status file
sdcMan->updateSdCardStateFile(); sdcMan->updateSdCardStateFile();
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
@ -240,21 +240,19 @@ ReturnValue_t CoreController::sdStateMachine() {
sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER; sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER;
} }
else { else {
// Is already off, update info // Is already off, update info, but with a small delay
sdInfo.state = SdStates::UPDATE_INFO; sdInfo.state = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
} }
#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT #elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
if(sdInfo.otherState == sd::SdState::OFF) { if(sdInfo.otherState == sd::SdState::OFF) {
sif::debug << "Determine: Setting other state on" << std::endl;
sdInfo.state = SdStates::SET_STATE_OTHER; sdInfo.state = SdStates::SET_STATE_OTHER;
} }
else if(sdInfo.otherState == sd::SdState::ON) { else if(sdInfo.otherState == sd::SdState::ON) {
sif::debug << "Determine: Mounting other" << std::endl;
sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER; sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER;
} }
else { else {
// Is already on and mounted, update info // Is already on and mounted, update info
sdInfo.state = SdStates::UPDATE_INFO; sdInfo.state = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
} }
#endif #endif
} }
@ -267,17 +265,18 @@ ReturnValue_t CoreController::sdStateMachine() {
sdInfo.commandExecuted = true; sdInfo.commandExecuted = true;
} }
else { else {
nonBlockingOpChecking(SdStates::UPDATE_INFO, 10, "Switching off other SD card"); nonBlockingOpChecking(SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE, 10,
"Switching off other SD card");
sdInfo.otherState = sd::SdState::OFF; sdInfo.otherState = sd::SdState::OFF;
currentStateSetter(sdInfo.other, sd::SdState::OFF); currentStateSetter(sdInfo.other, sd::SdState::OFF);
} }
#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT #elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
if(not sdInfo.commandExecuted) { if(not sdInfo.commandExecuted) {
result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar); result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar, false);
sdInfo.commandExecuted = true; sdInfo.commandExecuted = true;
} }
else { else {
nonBlockingOpChecking(SdStates::SdStates::MOUNT_UNMOUNT_OTHER, 10, nonBlockingOpChecking(SdStates::MOUNT_UNMOUNT_OTHER, 10,
"Switching on other SD card"); "Switching on other SD card");
sdInfo.otherState = sd::SdState::ON; sdInfo.otherState = sd::SdState::ON;
currentStateSetter(sdInfo.other, sd::SdState::ON); currentStateSetter(sdInfo.other, sd::SdState::ON);
@ -311,25 +310,28 @@ ReturnValue_t CoreController::sdStateMachine() {
#endif #endif
} }
if(sdInfo.state == SdStates::UPDATE_INFO) { if(sdInfo.state == SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE) {
if(not sdInfo.commandExecuted) { sdInfo.state = SdStates::UPDATE_INFO;
// It is assumed that all tasks are running by the point this section is reached. }
// Therefore, perform this operation in blocking mode because it does not take long else if(sdInfo.state == SdStates::UPDATE_INFO) {
// and the ready state of the SD card is available sooner // It is assumed that all tasks are running by the point this section is reached.
sdcMan->setBlocking(true); // Therefore, perform this operation in blocking mode because it does not take long
// Update status file // and the ready state of the SD card is available sooner
result = sdcMan->updateSdCardStateFile(); sdcMan->setBlocking(true);
if(result != HasReturnvaluesIF::RETURN_OK) { // Update status file
sif::warning << "CoreController::initialize: Updating SD card state file failed" result = sdcMan->updateSdCardStateFile();
<< std::endl; if(result != HasReturnvaluesIF::RETURN_OK) {
} sif::warning << "CoreController::initialize: Updating SD card state file failed"
sdInfo.commandExecuted = false; << std::endl;
sdInfo.state = SdStates::DONE; }
sdInfo.initFinished = true; sdInfo.commandExecuted = false;
sdInfo.cycleCount = 0; sdInfo.state = SdStates::DONE;
sdcMan->setBlocking(false); sdInfo.cycleCount = 0;
sdcMan->getSdCardActiveStatus(sdInfo.currentState); sdcMan->setBlocking(false);
sdcMan->getSdCardActiveStatus(sdInfo.currentState);
if(not sdInfo.initFinished) {
updateSdInfoOther(); updateSdInfoOther();
sdInfo.initFinished = true;
sif::info << "SD card initialization finished" << std::endl; sif::info << "SD card initialization finished" << std::endl;
} }
} }

16
bsp_q7s/core/CoreController.h
View File

@ -60,19 +60,29 @@ private:
ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t *msToReachTheMode); uint32_t *msToReachTheMode);
// States for non-blocking setup // States for SD state machine, which is used in non-blocking mode
enum class SdStates { enum class SdStates {
NONE, NONE,
START, START,
GET_INFO, GET_INFO,
SET_STATE_SELF, SET_STATE_SELF,
MOUNT_SELF, MOUNT_SELF,
// Determine operations for other SD card, depending on redundancy configuration
DETERMINE_OTHER, DETERMINE_OTHER,
SET_STATE_OTHER, SET_STATE_OTHER,
// Mount or unmount other // Mount or unmount other
MOUNT_UNMOUNT_OTHER, MOUNT_UNMOUNT_OTHER,
// Skip period because the shell command used to generate the info file sometimes is
// missing the last performed operation if executed too early
SKIP_CYCLE_BEFORE_INFO_UPDATE,
UPDATE_INFO, UPDATE_INFO,
DONE // SD initialization done
DONE,
// Used if SD switches or mount commands are issued via telecommand
SET_STATE_FROM_COMMAND,
MOUNT_FROM_COMMAND,
UNMOUNT_FROM_COMMAND,
}; };
static constexpr bool BLOCKING_SD_INIT = false; static constexpr bool BLOCKING_SD_INIT = false;
@ -93,6 +103,8 @@ private:
bool initFinished = false; bool initFinished = false;
SdCardManager::SdStatePair currentState; SdCardManager::SdStatePair currentState;
uint16_t cycleCount = 0; uint16_t cycleCount = 0;
sd::SdCard commandedCard = sd::SdCard::NONE;
sd::SdState commandedState = sd::SdState::OFF;
}; };
SdInfo sdInfo; SdInfo sdInfo;