Merge remote-tracking branch 'origin/development' into mueller/restructuring

2021-07-27 13:07:58 +02:00
parent ab6c616cdb 2d667cfb95
commit a94725c423
7 changed files with 83 additions and 77 deletions
--- a/src/fsfw/serviceinterface/ServiceInterfaceStream.cpp
+++ b/src/fsfw/serviceinterface/ServiceInterfaceStream.cpp
@@ -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