fixed merge conflicts

mission/utility/CMakeLists.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 target_sources(${LIB_EIVE_MISSION} PRIVATE
 	Timestamp.cpp
 	ProgressPrinter.cpp
@@ -5,3 +6,7 @@ target_sources(${LIB_EIVE_MISSION} PRIVATE
 )
 
 
+=======
+target_sources(${LIB_EIVE_MISSION} PRIVATE TmFunnel.cpp Timestamp.cpp
+                                           ProgressPrinter.cpp Filenaming.cpp)
+>>>>>>> meier/thermal-controller-fix

mission/utility/ProgressPrinter.cpp

@@ -1,5 +1,6 @@
 #include "ProgressPrinter.h"
 
+#include <cmath>
 #include <iomanip>
 
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
@@ -16,4 +17,9 @@ void ProgressPrinter::print(uint32_t currentStep) {
               << std::endl;
     nextProgressPrint += percentageResolution;
   }
+  if (nextProgressPrint - progressInPercent < 0) {
+    nextProgressPrint =
+        (std::floor(progressInPercent / percentageResolution) * percentageResolution) +
+        percentageResolution;
+  }
 }