From 7b82a7c1a787f68cb39cd565db418d79e73e47ef Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 22 Jan 2021 12:21:45 +0100 Subject: [PATCH] added stopwatch printf support --- timemanager/Stopwatch.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/timemanager/Stopwatch.cpp b/timemanager/Stopwatch.cpp index f79d2eeb..5d67e6c1 100644 --- a/timemanager/Stopwatch.cpp +++ b/timemanager/Stopwatch.cpp @@ -1,5 +1,5 @@ #include "Stopwatch.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "../serviceinterface/ServiceInterface.h" #include Stopwatch::Stopwatch(bool displayOnDestruction, @@ -28,9 +28,13 @@ double Stopwatch::stopSeconds() { void Stopwatch::display() { if(displayMode == StopwatchDisplayMode::MILLIS) { + dur_millis_t timeMillis = static_cast( + elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000); #if FSFW_CPP_OSTREAM_ENABLED == 1 - sif::info << "Stopwatch: Operation took " << (elapsedTime.tv_sec * 1000 + - elapsedTime.tv_usec / 1000) << " milliseconds" << std::endl; + sif::info << "Stopwatch: Operation took " << timeMillis << " milliseconds" << std::endl; +#else + sif::printInfo("Stopwatch: Operation took %lu milliseconds\n\r", + static_cast(timeMillis)); #endif } else if(displayMode == StopwatchDisplayMode::SECONDS) { @@ -38,6 +42,9 @@ void Stopwatch::display() { sif::info <<"Stopwatch: Operation took " << std::setprecision(3) << std::fixed << timevalOperations::toDouble(elapsedTime) << " seconds" << std::endl; +#else + sif::printInfo("Stopwatch: Operation took %.3f seconds\n\r", + static_cast(timevalOperations::toDouble(elapsedTime))); #endif } }