fsfw/fsfw-example-common
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed cmake variable / config define

Browse Source
This commit is contained in:
Robin Müller 2022-05-09 02:02:57 +02:00
parent bdc27d72f4
commit 503c6301c6
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
4 changed files with 7 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/commonConfig.h.in
View File

@ -6,7 +6,7 @@
#include <cstdint> #include <cstdint>
#cmakedefine01 FSFW_ADD_FMT_TESTS #cmakedefine01 OBSW_ADD_FMT_TESTS
//! Specify the debug output verbose level //! Specify the debug output verbose level
#define OBSW_VERBOSE_LEVEL 1 #define OBSW_VERBOSE_LEVEL 1

2
example/test/CMakeLists.txt
View File

@ -5,7 +5,7 @@ target_sources(${TARGET_NAME} PRIVATE
FsfwTestTask.cpp FsfwTestTask.cpp
) )
if(FSFW_ADD_FMT_TESTS) if(OBSW_ADD_FMT_TESTS)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
testFmt.cpp testFmt.cpp
) )

6
example/test/FsfwTestTask.cpp
View File

@ -2,14 +2,14 @@
#include <commonConfig.h> #include <commonConfig.h>
#if FSFW_ADD_FMT_TESTS == 1 #if OBSW_ADD_FMT_TESTS == 1
#include "testFmt.h" #include "testFmt.h"
#endif #endif
FsfwTestTask::FsfwTestTask(object_id_t objectId, bool periodicEvent) FsfwTestTask::FsfwTestTask(object_id_t objectId, bool periodicEvent)
: TestTask(objectId), periodicEvent(periodicEvent) { : TestTask(objectId), periodicEvent(periodicEvent) {
#if FSFW_ADD_FMT_TESTS == 1 #if OBSW_ADD_FMT_TESTS == 1
// fmtTests(); fmtTests();
#endif #endif
} }

181
example/test/testFmt.h
View File

@ -1,180 +1,3 @@
//#ifndef FSFW_EXAMPLE_HOSTED_TESTFMT_H #pragma once
//#define FSFW_EXAMPLE_HOSTED_TESTFMT_H
//
//#include <fmt/chrono.h>
//#include <fmt/color.h>
//#include <fmt/compile.h>
//#include <fmt/core.h>
//
//#include <array>
//#include <cstdint>
//
//#include "fsfw/ipc/MutexFactory.h"
//#include "fsfw/ipc/MutexGuard.h"
//#include "fsfw/ipc/MutexIF.h"
//#include "fsfw/timemanager/Clock.h"
//
//#define __FILENAME_REL__ (((const char*)__FILE__ + SOURCE_PATH_SIZE))
//#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
//
void fmtTests(); void fmtTests();
//
// namespace sif {
//
// static std::array<char, 524> _PRINT_BUF = {};
//
// static const char INFO_PREFIX[] = "INFO";
// static const char DEBUG_PREFIX[] = "DEBUG";
// static const char WARNING_PREFIX[] = "WARNING";
// static const char ERROR_PREFIX[] = "ERROR";
//
// enum class LogLevel : unsigned int { DEBUG = 0, INFO = 1, WARNING = 2, ERROR = 3 };
//
// static const char* PREFIX_ARR[4] = {DEBUG_PREFIX, INFO_PREFIX, WARNING_PREFIX, ERROR_PREFIX};
//
// static const std::array<fmt::color, 4> LOG_COLOR_ARR = {
// fmt::color::deep_sky_blue, fmt::color::forest_green, fmt::color::orange_red, fmt::color::red};
//
// static MutexIF* PRINT_MUTEX = nullptr;
//
////static ReturnValue_t initialize() {
//// PRINT_MUTEX = MutexFactory::instance()->createMutex();
//// if(PRINT_MUTEX == nullptr) {
//// return HasReturnvaluesIF::RETURN_FAILED;
//// }
//// return HasReturnvaluesIF::RETURN_OK;
////}
//
// static size_t writeTypePrefix(LogLevel level) {
// auto idx = static_cast<unsigned int>(level);
// const auto result =
// fmt::format_to_n(_PRINT_BUF.begin(), _PRINT_BUF.size() - 1,
// fmt::runtime(fmt::format(fg(LOG_COLOR_ARR[idx]), PREFIX_ARR[idx])));
// return result.size;
//}
//
// template <typename... T>
// size_t logTraced(LogLevel level, const char* file, unsigned int line, bool timed,
// fmt::format_string<T...> fmt, T&&... args) noexcept {
// if(PRINT_MUTEX == nullptr) {
// fmt::print("Please call sif::initialize at program startup\n");
// return 0;
// }
// try {
// MutexGuard mg(PRINT_MUTEX);
// size_t bufPos = writeTypePrefix(level);
// auto currentIter = _PRINT_BUF.begin() + bufPos;
// if (timed) {
// Clock::TimeOfDay_t logTime;
// Clock::getDateAndTime(&logTime);
// const auto result = fmt::format_to_n(currentIter, _PRINT_BUF.size() - 1 - bufPos,
// " | {}[l.{}] | {:02}:{:02}:{:02}.{:03} | {}", file,
// line, logTime.hour, logTime.minute, logTime.second,
// logTime.usecond / 1000, fmt::format(fmt, args...));
// *result.out = '\0';
// bufPos += result.size;
// } else {
// const auto result = fmt::format_to_n(currentIter, _PRINT_BUF.size() - 1 - bufPos,
// " | {}[l.{}] | {}", file, line, fmt::format(fmt,
// args...));
// *result.out = '\0';
// bufPos += result.size;
// }
//
// fmt::print(fmt::runtime(_PRINT_BUF.data()));
// return bufPos;
// } catch (const fmt::v8::format_error& e) {
// fmt::print("Printing failed with error: {}\n", e.what());
// return 0;
// }
//}
//
// template <typename... T>
// size_t log(LogLevel level, bool timed, fmt::format_string<T...> fmt, T&&... args) noexcept {
// if(PRINT_MUTEX == nullptr) {
// fmt::print("Please call sif::initialize at program startup\n");
// return 0;
// }
// try {
// MutexGuard mg(PRINT_MUTEX);
// size_t bufPos = writeTypePrefix(level);
// auto currentIter = _PRINT_BUF.begin() + bufPos;
// if (timed) {
// Clock::TimeOfDay_t logTime;
// Clock::getDateAndTime(&logTime);
// const auto result = fmt::format_to_n(
// currentIter, _PRINT_BUF.size() - bufPos, " | {:02}:{:02}:{:02}.{:03} | {}",
// logTime.hour, logTime.minute, logTime.second, logTime.usecond / 1000, fmt::format(fmt,
// args...));
// bufPos += result.size;
// }
// fmt::print(fmt::runtime(_PRINT_BUF.data()));
// return bufPos;
// } catch (const fmt::v8::format_error& e) {
// fmt::print("Printing failed with error: {}\n", e.what());
// return 0;
// }
//}
//
// template <typename... T>
// void fdebug(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args)
// noexcept {
// logTraced(LogLevel::DEBUG, file, line, false, fmt, args...);
//}
//
// template <typename... T>
// void fdebug_t(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args)
// noexcept {
// logTraced(LogLevel::DEBUG, file, line, true, fmt, args...);
//}
//
// template <typename... T>
// void finfo_t(fmt::format_string<T...> fmt, T&&... args) {
// log(LogLevel::INFO, true, fmt, args...);
//}
//
// template <typename... T>
// void finfo(fmt::format_string<T...> fmt, T&&... args) {
// log(LogLevel::INFO, false, fmt, args...);
//}
//
// template <typename... T>
// void fwarning(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args) {
// logTraced(LogLevel::WARNING, file, line, false, fmt, args...);
//}
//
// template <typename... T>
// void fwarning_t(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args) {
// logTraced(LogLevel::WARNING, file, line, true, fmt, args...);
//}
//
// template <typename... T>
// void ferror(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args) {
// logTraced(LogLevel::ERROR, file, line, false, fmt, args...);
//}
//
// template <typename... T>
// void ferror_t(const char* file, unsigned int line, fmt::format_string<T...> fmt, T&&... args) {
// logTraced(LogLevel::ERROR, file, line, true, fmt, args...);
//}
//
//} // namespace sif
//
//#define FSFW_FLOGI(format, ...) finfo(FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_FLOGIT(format, ...) finfo_t(FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_LOGD(format, ...) sif::fdebug(__FILENAME__, __LINE__, FMT_STRING(format),
//__VA_ARGS__)
//
//#define FSFW_LOGDT(format, ...) fdebug_t(__FILENAME__, __LINE__, FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_FLOGW(format, ...) fdebug(__FILENAME__, __LINE__, FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_FLOGWT(format, ...) fdebug_t(__FILENAME__, __LINE__, FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_FLOGE(format, ...) fdebug(__FILENAME__, __LINE__, FMT_STRING(format), __VA_ARGS__)
//
//#define FSFW_FLOGET(format, ...) fdebug_t(__FILENAME__, __LINE__, FMT_STRING(format), __VA_ARGS__)
//
//#endif // FSFW_EXAMPLE_HOSTED_TESTFMT_H