From 503c6301c63848b38a9f9254e856614b473a27f0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 May 2022 02:02:57 +0200 Subject: [PATCH] renamed cmake variable / config define --- config/commonConfig.h.in | 2 +- example/test/CMakeLists.txt | 2 +- example/test/FsfwTestTask.cpp | 6 +- example/test/testFmt.h | 181 +--------------------------------- 4 files changed, 7 insertions(+), 184 deletions(-) diff --git a/config/commonConfig.h.in b/config/commonConfig.h.in index a0449da..af89d1e 100644 --- a/config/commonConfig.h.in +++ b/config/commonConfig.h.in @@ -6,7 +6,7 @@ #include -#cmakedefine01 FSFW_ADD_FMT_TESTS +#cmakedefine01 OBSW_ADD_FMT_TESTS //! Specify the debug output verbose level #define OBSW_VERBOSE_LEVEL 1 diff --git a/example/test/CMakeLists.txt b/example/test/CMakeLists.txt index 3b93a30..6f512d0 100644 --- a/example/test/CMakeLists.txt +++ b/example/test/CMakeLists.txt @@ -5,7 +5,7 @@ target_sources(${TARGET_NAME} PRIVATE FsfwTestTask.cpp ) -if(FSFW_ADD_FMT_TESTS) +if(OBSW_ADD_FMT_TESTS) target_sources(${TARGET_NAME} PRIVATE testFmt.cpp ) diff --git a/example/test/FsfwTestTask.cpp b/example/test/FsfwTestTask.cpp index 37350b4..78f491d 100644 --- a/example/test/FsfwTestTask.cpp +++ b/example/test/FsfwTestTask.cpp @@ -2,14 +2,14 @@ #include -#if FSFW_ADD_FMT_TESTS == 1 +#if OBSW_ADD_FMT_TESTS == 1 #include "testFmt.h" #endif FsfwTestTask::FsfwTestTask(object_id_t objectId, bool periodicEvent) : TestTask(objectId), periodicEvent(periodicEvent) { -#if FSFW_ADD_FMT_TESTS == 1 - // fmtTests(); +#if OBSW_ADD_FMT_TESTS == 1 + fmtTests(); #endif } diff --git a/example/test/testFmt.h b/example/test/testFmt.h index bfe9ea3..2df80c3 100644 --- a/example/test/testFmt.h +++ b/example/test/testFmt.h @@ -1,180 +1,3 @@ -//#ifndef FSFW_EXAMPLE_HOSTED_TESTFMT_H -//#define FSFW_EXAMPLE_HOSTED_TESTFMT_H -// -//#include -//#include -//#include -//#include -// -//#include -//#include -// -//#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__) -// +#pragma once + void fmtTests(); -// -// namespace sif { -// -// static std::array _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 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(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 -// size_t logTraced(LogLevel level, const char* file, unsigned int line, bool timed, -// fmt::format_string 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 -// size_t log(LogLevel level, bool timed, fmt::format_string 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 -// void fdebug(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) -// noexcept { -// logTraced(LogLevel::DEBUG, file, line, false, fmt, args...); -//} -// -// template -// void fdebug_t(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) -// noexcept { -// logTraced(LogLevel::DEBUG, file, line, true, fmt, args...); -//} -// -// template -// void finfo_t(fmt::format_string fmt, T&&... args) { -// log(LogLevel::INFO, true, fmt, args...); -//} -// -// template -// void finfo(fmt::format_string fmt, T&&... args) { -// log(LogLevel::INFO, false, fmt, args...); -//} -// -// template -// void fwarning(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) { -// logTraced(LogLevel::WARNING, file, line, false, fmt, args...); -//} -// -// template -// void fwarning_t(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) { -// logTraced(LogLevel::WARNING, file, line, true, fmt, args...); -//} -// -// template -// void ferror(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) { -// logTraced(LogLevel::ERROR, file, line, false, fmt, args...); -//} -// -// template -// void ferror_t(const char* file, unsigned int line, fmt::format_string 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