fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

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
Conversation 0 Commits 6 Files Changed 6 +9 -4
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaultcfg/fsfwconfig/objects/FsfwFactory.cpp
View File

@ -4,7 +4,7 @@
#include <fsfw/devicehandlers/DeviceHandlerBase.h>
#include <fsfw/events/EventManager.h>
#include <fsfw/health/HealthTable.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/tmtcpacket/pus/tm/TmPacketStored.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include <fsfw/internalError/InternalErrorReporter.h>

1
osal/FreeRTOS/MessageQueue.h
View File

@ -11,7 +11,6 @@
#include "FreeRTOS.h"
#include "queue.h"
/**
meierj marked this conversation as resolved Outdated
muellerr commented 2021-07-26 14:43:24 +02:00
Outdated
Review
Copy Link

double include

double include
* @brief This class manages sending and receiving of
* message queue messages.

4
serviceinterface/ServiceInterfaceBuffer.cpp
View File

@ -171,9 +171,11 @@ bool ServiceInterfaceBuffer::crAdditionEnabled() const {
return addCrToPreamble;
}
#if FSFW_COLORED_OUTPUT == 1
void ServiceInterfaceBuffer::setAsciiColorPrefix(std::string colorPrefix) {
meierj marked this conversation as resolved Outdated
muellerr commented 2021-07-27 10:05:20 +02:00
Outdated
Review
Copy Link

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;
this->colorPrefix = colorPrefix;
}
#endif
#ifdef UT699
#include "../osal/rtems/Interrupt.h"

2
serviceinterface/ServiceInterfaceStream.cpp
View File

@ -19,9 +19,11 @@ bool ServiceInterfaceStream::crAdditionEnabled() const {
return streambuf.crAdditionEnabled();
}
#if FSFW_COLORED_OUTPUT == 1
void ServiceInterfaceStream::setAsciiColorPrefix(std::string asciiColorCode) {
streambuf.setAsciiColorPrefix(asciiColorCode);
}
#endif
#endif

2
serviceinterface/ServiceInterfaceStream.h
View File

@ -46,7 +46,9 @@ public:
*/
bool crAdditionEnabled() const;
#if FSFW_COLORED_OUTPUT == 1
void setAsciiColorPrefix(std::string asciiColorCode);
#endif
protected:
ServiceInterfaceBuffer streambuf;

2
unittest/user/unittest/core/CatchFactory.cpp
View File

@ -7,7 +7,7 @@
#include <fsfw/internalError/InternalErrorReporter.h>
#include <fsfw/objectmanager/frameworkObjects.h>
#include <fsfw/storagemanager/PoolManager.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/tmtcpacket/pus/tm/TmPacketStored.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include <fsfw/unittest/tests/datapoollocal/LocalPoolOwnerBase.h>