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

fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Jakob Meier
2022-05-23 16:53:20 +02:00
parent 379c5f06ba a2eabdce01
commit d808a12c31
97 changed files with 2431 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,8 @@
#endif
#include "fsfw/globalfunctions/CRC.h"
#include "fsfw/timemanager/Countdown.h"
#include "fsfw/tasks/TaskFactory.h"
#include "fsfw/timemanager/Countdown.h"
#include "mission/utility/Filenaming.h"
#include "mission/utility/ProgressPrinter.h"
#include "mission/utility/Timestamp.h"
@ -214,6 +214,7 @@ ReturnValue_t PlocSupvHelper::writeUpdatePackets() {
while (update.remainingSize > 0) {
if (terminate) {
terminate = false;
triggerEvent(TERMINATED_UPDATE_PROCEDURE);
return PROCESS_TERMINATED;
}
if (update.remainingSize > supv::WriteMemory::CHUNK_MAX) {
@ -433,8 +434,7 @@ ReturnValue_t PlocSupvHelper::receive(uint8_t* data, size_t* readBytes, size_t r
}
if (*readBytes > 0) {
std::memcpy(data, buffer, *readBytes);
}
else {
} else {
TaskFactory::delayTask(40);
}
return result;