Colored prefix option only if colored output is enabled #449

Merged
muellerr merged 6 commits from meier/ColeredDebugOutput into development 2021-07-27 13:07:16 +02:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 3d80d5d036 - Show all commits

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) {
meierj marked this conversation as resolved Outdated

Usually code in preprocessor defines has not been indented yet. I'd keep it consistent

Usually code in preprocessor defines has not been indented yet. I'd keep it consistent
this->colorPrefix = colorPrefix;
}
#endif
#ifdef UT699

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>
meierj marked this conversation as resolved Outdated

I think this needs to remain #include <unittest/core/CatchDefinitions.h> but I'd need to check fsfw-test for that again.. Unless you are sure this is the correct include, I'd leave it the old way

I think this needs to remain `#include <unittest/core/CatchDefinitions.h>` but I'd need to check `fsfw-test` for that again.. Unless you are sure this is the correct include, I'd leave it the old way
#include <cstring>
#include <queue>