From 2ee70d53d943bfbdd061f93b7e4309a2939fa8a0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 22 Feb 2023 14:27:50 +0100
Subject: [PATCH] more tweaks

---
 mission/core/GenericFactory.cpp | 8 ++++----
 mission/tmtc/PusTmFunnel.cpp    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 306e4527..9e929e83 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -237,7 +237,7 @@ void ObjectFactory::createRwAssy(PowerSwitchIF& pwrSwitcher, power::Switch_t the
                                  std::array<object_id_t, 4> rwIds) {
   RwHelper rwHelper(rwIds);
   auto* rwAss = new RwAssembly(objects::RW_ASS, &pwrSwitcher, theSwitch, rwHelper);
-  for (uint8_t idx = 0; idx < rwIds.size(); idx++) {
+  for (size_t idx = 0; idx < rwIds.size(); idx++) {
     ReturnValue_t result = rws[idx]->connectModeTreeParent(*rwAss);
     if (result != returnvalue::OK) {
       sif::error << "Connecting RW " << static_cast<int>(idx) << " to RW assembly failed"
@@ -256,7 +256,7 @@ void ObjectFactory::createSusAssy(PowerSwitchIF& pwrSwitcher,
       objects::SUS_6_R_LOC_XFYBZM_PT_XF,  objects::SUS_7_R_LOC_XBYBZM_PT_XB,
       objects::SUS_8_R_LOC_XBYBZB_PT_YB,  objects::SUS_9_R_LOC_XBYBZB_PT_YF,
       objects::SUS_10_N_LOC_XMYBZF_PT_ZF, objects::SUS_11_R_LOC_XBYMZB_PT_ZB};
-  SusAssHelper susAssHelper = SusAssHelper(susIds);
+  auto susAssHelper = SusAssHelper(susIds);
   auto susAss = new SusAssembly(objects::SUS_BOARD_ASS, &pwrSwitcher, susAssHelper);
   for (auto& sus : suses) {
     if (sus != nullptr) {
@@ -292,8 +292,8 @@ void ObjectFactory::createAcsBoardAssy(PowerSwitchIF& pwrSwitcher,
 
 TcsBoardAssembly* ObjectFactory::createTcsBoardAssy(PowerSwitchIF& pwrSwitcher) {
   TcsBoardHelper helper(RTD_INFOS);
-  TcsBoardAssembly* tcsBoardAss = new TcsBoardAssembly(
-      objects::TCS_BOARD_ASS, &pwrSwitcher, pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
+  auto* tcsBoardAss = new TcsBoardAssembly(objects::TCS_BOARD_ASS, &pwrSwitcher,
+                                           pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
   tcsBoardAss->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
   return tcsBoardAss;
 }
diff --git a/mission/tmtc/PusTmFunnel.cpp b/mission/tmtc/PusTmFunnel.cpp
index b135b776..a0f345cb 100644
--- a/mission/tmtc/PusTmFunnel.cpp
+++ b/mission/tmtc/PusTmFunnel.cpp
@@ -1,14 +1,14 @@
 #include "PusTmFunnel.h"
 
 #include "eive/definitions.h"
-#include "fsfw/pus/Service5EventReporting.h"
 #include "eive/objects.h"
 #include "fsfw/ipc/CommandMessage.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager.h"
+#include "fsfw/pus/Service5EventReporting.h"
 #include "fsfw/tmstorage/TmStoreMessage.h"
-#include "tmtc/pusIds.h"
 #include "fsfw/tmtcpacket/pus/tm/PusTmZcWriter.h"
+#include "tmtc/pusIds.h"
 
 PusTmFunnel::PusTmFunnel(TmFunnelBase::FunnelCfg cfg, TimeReaderIF &timeReader,
                          SdCardMountedIF &sdcMan)
@@ -35,7 +35,8 @@ PusTmFunnel::PusTmFunnel(TmFunnelBase::FunnelCfg cfg, TimeReaderIF &timeReader,
   miscStore.addService(pus::PUS_SERVICE_9);
   miscStore.addService(pus::PUS_SERVICE_20);
   okStore.addApid(config::EIVE_PUS_APID);
-  okStore.addServiceSubservice(pus::PUS_SERVICE_5, Service5EventReporting::Subservice::NORMAL_REPORT);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_5,
+                               Service5EventReporting::Subservice::NORMAL_REPORT);
   okStore.addService(pus::PUS_SERVICE_8);
   okStore.addServiceSubservice(pus::PUS_SERVICE_1, 1);
   okStore.addServiceSubservice(pus::PUS_SERVICE_1, 3);