From 5bf4e50849f2ff0008b751a46be75a693440eb56 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 24 Feb 2022 12:02:23 +0100
Subject: [PATCH] clean up includes

---
 bsp_q7s/core/ObjectFactory.cpp                | 41 +++++++++----------
 .../pollingSequenceFactory.cpp                |  5 ++-
 mission/devices/SusHandler.cpp                |  3 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 3591698f..66fb4a3a 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -1,9 +1,10 @@
 #include "ObjectFactory.h"
 
-#include <linux/boardtest/I2cTestClass.h>
-#include <linux/boardtest/UartTestClass.h>
-
-#include <sstream>
+#include <linux/obc/AxiPtmeConfig.h>
+#include <linux/obc/PapbVcInterface.h>
+#include <linux/obc/PdecHandler.h>
+#include <linux/obc/Ptme.h>
+#include <linux/obc/PtmeConfig.h>
 
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
@@ -25,6 +26,20 @@
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "devices/powerSwitcherList.h"
+#include "linux/boardtest/I2cTestClass.h"
+#include "linux/boardtest/SpiTestClass.h"
+#include "linux/boardtest/UartTestClass.h"
+#include "linux/csp/CspComIF.h"
+#include "linux/csp/CspCookie.h"
+#include "linux/devices/SolarArrayDeploymentHandler.h"
+#include "tmtc/apid.h"
+#include "tmtc/pusIds.h"
+#if OBSW_TEST_LIBGPIOD == 1
+#include "linux/boardtest/LibgpiodTest.h"
+#endif
+
+#include <sstream>
+
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
 #include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
@@ -40,13 +55,10 @@
 #include "fsfw_hal/linux/spi/SpiCookie.h"
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/uart/UartCookie.h"
-#include "linux/boardtest/SpiTestClass.h"
-#include "linux/csp/CspComIF.h"
-#include "linux/csp/CspCookie.h"
-#include "mission/devices/GPSHyperionLinuxController.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/ACUHandler.h"
 #include "mission/devices/BpxBatteryHandler.h"
+#include "mission/devices/GPSHyperionLinuxController.h"
 #include "mission/devices/GyroADIS1650XHandler.h"
 #include "mission/devices/HeaterHandler.h"
 #include "mission/devices/IMTQHandler.h"
@@ -58,7 +70,6 @@
 #include "mission/devices/PlocMPSoCHandler.h"
 #include "mission/devices/RadiationSensorHandler.h"
 #include "mission/devices/RwHandler.h"
-#include "linux/devices/SolarArrayDeploymentHandler.h"
 #include "mission/devices/SusHandler.h"
 #include "mission/devices/SyrlinksHkHandler.h"
 #include "mission/devices/Tmp1075Handler.h"
@@ -72,18 +83,6 @@
 #include "mission/tmtc/CCSDSHandler.h"
 #include "mission/tmtc/VirtualChannel.h"
 #include "mission/utility/TmFunnel.h"
-#include "tmtc/apid.h"
-#include "tmtc/pusIds.h"
-
-#if OBSW_TEST_LIBGPIOD == 1
-#include "linux/boardtest/LibgpiodTest.h"
-#endif
-
-#include <linux/obc/AxiPtmeConfig.h>
-#include <linux/obc/PapbVcInterface.h>
-#include <linux/obc/PdecHandler.h>
-#include <linux/obc/Ptme.h>
-#include <linux/obc/PtmeConfig.h>
 
 ResetArgs resetArgsGnss0;
 ResetArgs resetArgsGnss1;
diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index 310e8f9a..b6444a74 100644
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -1,12 +1,13 @@
 #include "pollingSequenceFactory.h"
-#include "OBSWConfig.h"
-#include "objects/systemObjectList.h"
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 
+#include "OBSWConfig.h"
+#include "objects/systemObjectList.h"
+
 ReturnValue_t pst::pstGpio(FixedTimeslotTaskIF *thisSequence) {
   // Length of a communication cycle
   uint32_t length = thisSequence->getPeriodMs();
diff --git a/mission/devices/SusHandler.cpp b/mission/devices/SusHandler.cpp
index 9c55409e..602e0a20 100644
--- a/mission/devices/SusHandler.cpp
+++ b/mission/devices/SusHandler.cpp
@@ -214,7 +214,8 @@ void SusHandler::setToGoToNormalMode(bool enable) { this->goToNormalModeImmediat
 void SusHandler::printDataset() {
   if (periodicPrintout) {
     if (divider.checkAndIncrement()) {
-      sif::info << "SUS ADC " << static_cast<int>(susIdx) << " hex [" << std::setfill('0') << std::hex;
+      sif::info << "SUS ADC " << static_cast<int>(susIdx) << " hex [" << std::setfill('0')
+                << std::hex;
       for (uint8_t idx = 0; idx < 6; idx++) {
         sif::info << std::setw(3) << dataset.channels[idx];
         if (idx < 6 - 1) {