diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp index 168856e..36be334 100644 --- a/example/core/GenericFactory.cpp +++ b/example/core/GenericFactory.cpp @@ -10,6 +10,7 @@ #include "fsfw/health/HealthTable.h" #include "fsfw/internalerror/InternalErrorReporter.h" #include "fsfw/pus/CService200ModeCommanding.h" +#include "fsfw/pus/Service11TelecommandScheduling.h" #include "fsfw/pus/Service17Test.h" #include "fsfw/pus/Service1TelecommandVerification.h" #include "fsfw/pus/Service20ParameterManagement.h" @@ -39,7 +40,7 @@ void ObjectFactory::produceGenericObjects() { new HealthTable(objects::HEALTH_TABLE); new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER); new TimeStamper(objects::TIME_STAMPER); - new CCSDSDistributor(apid::APID, objects::CCSDS_DISTRIBUTOR); + auto* ccsdsDistrib = new CCSDSDistributor(apid::APID, objects::CCSDS_DISTRIBUTOR); new PUSDistributor(apid::APID, objects::PUS_DISTRIBUTOR, objects::CCSDS_DISTRIBUTOR); new TmFunnel(objects::TM_FUNNEL); #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ @@ -59,6 +60,8 @@ void ObjectFactory::produceGenericObjects() { new Service17Test(objects::PUS_SERVICE_17_TEST, apid::APID, pus::PUS_SERVICE_17); new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, apid::APID, pus::PUS_SERVICE_20); + new Service11TelecommandScheduling<100>(objects::PUS_SERVICE_11_TC_SCHEDULER, apid::APID, + pus::PUS_SERVICE_11, ccsdsDistrib); new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, apid::APID, pus::PUS_SERVICE_200); #endif /* OBSW_ADD_PUS_STACK == 1 */ diff --git a/example/test/testFmt.h b/example/test/testFmt.h index c47d683..98a35da 100644 --- a/example/test/testFmt.h +++ b/example/test/testFmt.h @@ -62,8 +62,9 @@ size_t logTraced(LogLevel level, const char* file, unsigned int line, bool timed *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...)); + 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; } @@ -99,12 +100,14 @@ size_t log(LogLevel level, bool timed, fmt::format_string fmt, T&&... args } template -void fdebug(const char* file, unsigned int line, fmt::format_string fmt, T&&... args) noexcept { +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 { +void fdebug_t(const char* file, unsigned int line, fmt::format_string fmt, + T&&... args) noexcept { logTraced(LogLevel::DEBUG, file, line, true, fmt, args...); }