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 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7bc35ea45 - Show all commits

6
linux/devices/ploc/PlocSupervisorHandler.cpp
View File

@ -2066,9 +2066,9 @@ ReturnValue_t PlocSupervisorHandler::eventSubscription() {
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;
} }
result = manager->subscribeToEventRange( result = manager->subscribeToEventRange(eventQueue->getId(),
eventQueue->getId(), event::getEventId(PlocSupvHelper::SUPV_UPDATE_FAILED), event::getEventId(PlocSupvHelper::SUPV_UPDATE_FAILED),
event::getEventId(PlocSupvHelper::SUPV_MEM_CHECK_FAIL)); event::getEventId(PlocSupvHelper::SUPV_MEM_CHECK_FAIL));
if (result != RETURN_OK) { if (result != RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "PlocSupervisorHandler::eventSubscritpion: Failed to subscribe to events from " sif::warning << "PlocSupervisorHandler::eventSubscritpion: Failed to subscribe to events from "

16
linux/devices/ploc/PlocSupvHelper.cpp
View File

@ -194,26 +194,26 @@ void PlocSupvHelper::stopProcess() { terminate = true; }
void PlocSupvHelper::executeFullCheckMemoryCommand() { void PlocSupvHelper::executeFullCheckMemoryCommand() {
ReturnValue_t result; ReturnValue_t result;
if (update.crcShouldBeChecked) { if (update.crcShouldBeChecked) {
sif::info << "PlocSupvHelper::performUpdate: Calculating Image CRC" << std::endl; sif::info << "PLOC SUPV Mem Check: Calculating Image CRC" << std::endl;
result = calcImageCrc(); result = calcImageCrc();
if (result != RETURN_OK) { if (result != RETURN_OK) {
triggerEvent(SUPV_MEM_CHECK_FAIL, result); triggerEvent(SUPV_MEM_CHECK_FAIL, result);
return; return;
} }
} }
sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Selecting Memory" << std::endl; sif::info << "PLOC SUPV Mem Check: Selecting Memory" << std::endl;
result = selectMemory(); result = selectMemory();
if (result != RETURN_OK) { if (result != RETURN_OK) {
triggerEvent(SUPV_MEM_CHECK_FAIL, result); triggerEvent(SUPV_MEM_CHECK_FAIL, result);
return; return;
} }
sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Preparing Update" << std::endl; sif::info << "PLOC SUPV Mem Check: Preparing Update" << std::endl;
result = prepareUpdate(); result = prepareUpdate();
if (result != RETURN_OK) { if (result != RETURN_OK) {
triggerEvent(SUPV_MEM_CHECK_FAIL, result); triggerEvent(SUPV_MEM_CHECK_FAIL, result);
return; return;
} }
sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Memory Check" << std::endl; sif::info << "PLOC SUPV Mem Check: Memory Check" << std::endl;
result = handleCheckMemoryCommand(); result = handleCheckMemoryCommand();
if (result == HasReturnvaluesIF::RETURN_OK) { if (result == HasReturnvaluesIF::RETURN_OK) {
triggerEvent(SUPV_MEM_CHECK_OK, result); triggerEvent(SUPV_MEM_CHECK_OK, result);
@ -224,22 +224,22 @@ void PlocSupvHelper::executeFullCheckMemoryCommand() {
ReturnValue_t PlocSupvHelper::performUpdate() { ReturnValue_t PlocSupvHelper::performUpdate() {
ReturnValue_t result = RETURN_OK; ReturnValue_t result = RETURN_OK;
sif::info << "PlocSupvHelper::performUpdate: Calculating Image CRC" << std::endl; sif::info << "PLOC SUPV Update MPSoC: Calculating Image CRC" << std::endl;
result = calcImageCrc(); result = calcImageCrc();
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;
} }
sif::info << "PlocSupvHelper::performUpdate: Selecting Memory" << std::endl; sif::info << "PLOC SUPV Update MPSoC: Selecting Memory" << std::endl;
result = selectMemory(); result = selectMemory();
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;
} }
sif::info << "PlocSupvHelper::performUpdate: Preparing Update" << std::endl; sif::info << "PLOC SUPV Update MPSoC: Preparing Update" << std::endl;
result = prepareUpdate(); result = prepareUpdate();
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;
} }
sif::info << "PlocSupvHelper::performUpdate: Erasing Memory" << std::endl; sif::info << "PLOC SUPV Update MPSoC: Erasing Memory" << std::endl;
result = eraseMemory(); result = eraseMemory();
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;