Merge branch 'develop' into mueller/rtd-bugfixes

bsp_q7s/em/emObjectFactory.cpp

@@ -1,4 +1,5 @@
 #include <fsfw/health/HealthTableIF.h>
+
 #include "OBSWConfig.h"
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"

bsp_q7s/obsw.cpp

@@ -4,11 +4,11 @@
 #include <iostream>
 
 #include "OBSWConfig.h"
-#include "q7sConfig.h"
 #include "commonConfig.h"
 #include "core/InitMission.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
+#include "q7sConfig.h"
 #include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;

linux/devices/CMakeLists.txt

@@ -2,9 +2,7 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
   target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
 endif()
 
-target_sources(${OBSW_NAME} PRIVATE
-	Max31865RtdLowlevelHandler.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE Max31865RtdLowlevelHandler.cpp)
 
 add_subdirectory(ploc)
 add_subdirectory(startracker)

mission/utility/ProgressPrinter.cpp

@@ -1,7 +1,7 @@
 #include "ProgressPrinter.h"
 
-#include <iomanip>
 #include <cmath>
+#include <iomanip>
 
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"