eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update EIVE FSFW #8

Merged
meierj merged 31 commits from mueller/master into eive/develop 2021-08-05 16:35:24 +02:00
Conversation 1 Commits 31 Files Changed 162 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d80d5d036 - Show all commits

6
serviceinterface/ServiceInterfaceBuffer.cpp
View File

@ -172,9 +172,9 @@ bool ServiceInterfaceBuffer::crAdditionEnabled() const {
}
#if FSFW_COLORED_OUTPUT == 1
void ServiceInterfaceBuffer::setAsciiColorPrefix(std::string colorPrefix) {
this->colorPrefix = colorPrefix;
}
void ServiceInterfaceBuffer::setAsciiColorPrefix(std::string colorPrefix) {
this->colorPrefix = colorPrefix;
}
#endif
#ifdef UT699

2
unittest/tests/mocks/MessageQueueMockBase.h
View File

@ -3,7 +3,7 @@
#include <fsfw/ipc/MessageQueueIF.h>
#include <fsfw/ipc/MessageQueueMessage.h>
#include <unittest/user/unittest/core/CatchDefinitions.h>
#include <unittest/core/CatchDefinitions.h>
#include <cstring>
#include <queue>