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

v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Conversation 0 Commits 493 Files Changed 264 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 835a10e538 - Show all commits

10
bsp_q7s/core/CoreController.cpp
View File

@ -1708,11 +1708,11 @@ ReturnValue_t CoreController::timeFileHandler() {
} }
std::string fileName = currMntPrefix + TIME_FILE; std::string fileName = currMntPrefix + TIME_FILE;
std::ofstream timeFile(fileName); std::ofstream timeFile(fileName);
if (not timeFile.good()) { // if (not timeFile.good()) {
sif::error << "CoreController::timeFileHandler: Error opening time file: " << strerror(errno) // sif::error << "CoreController::timeFileHandler: Error opening time file: " << strerror(errno)
<< std::endl; // << std::endl;
return RETURN_FAILED; // return RETURN_FAILED;
} // }
timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl; timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl;
} }
return RETURN_OK; return RETURN_OK;

2
fsfw

@ -1 +1 @@
Subproject commit bc994595dae47fbe57d5a4fa70ad23f90e9410f9 Subproject commit 0d45b35ea7fe2360e3aa4f9b16bb6c2f63422689

2
linux/devices/ploc/PlocMPSoCHandler.h
View File

@ -108,7 +108,7 @@ class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
MessageQueueIF* eventQueue = nullptr; MessageQueueIF* eventQueue = nullptr;
MessageQueueIF* commandActionHelperQueue = nullptr; MessageQueueIF* commandActionHelperQueue = nullptr;
SourceSequenceCounter sequenceCount = SourceSequenceCounter(0); SourceSequenceCounter sequenceCount = SourceSequenceCounter(SpacePacketBase::LIMIT_SEQUENCE_COUNT - 1);
uint8_t commandBuffer[mpsoc::MAX_COMMAND_SIZE]; uint8_t commandBuffer[mpsoc::MAX_COMMAND_SIZE];