From 263ac1f663d178d096cbbfc7de52fdb8ef4a6c4d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 6 Dec 2023 11:44:28 +0100 Subject: [PATCH] wtf is this --- bsp_q7s/objectFactory.cpp | 4 +--- dummies/helperFactory.cpp | 2 +- linux/ObjectFactory.cpp | 6 +----- mission/system/systemTree.cpp | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp index 0880785b..ab400227 100644 --- a/bsp_q7s/objectFactory.cpp +++ b/bsp_q7s/objectFactory.cpp @@ -39,9 +39,7 @@ #include "bsp_q7s/acs/StrConfigPathGetter.h" #include "bsp_q7s/boardtest/Q7STestTask.h" #include "bsp_q7s/callbacks/gnssCallback.h" -#include "bsp_q7s/callbacks/pcduSwitchCb.h" #include "bsp_q7s/callbacks/q7sGpioCallbacks.h" -#include "bsp_q7s/callbacks/rwSpiCallback.h" #include "busConf.h" #include "ccsdsConfig.h" #include "devConf.h" @@ -73,7 +71,7 @@ #include "mission/system/tcs/RtdFdir.h" #include "mission/system/tcs/TcsBoardAssembly.h" #include "mission/system/tcs/tcsModeTree.h" -#include "mission/system/tree/payloadModeTree.h" +#include "mission/system/payloadModeTree.h" #include "mission/tmtc/tmFilters.h" #include "mission/utility/GlobalConfigHandler.h" #include "tmtc/pusIds.h" diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp index 42ec1eec..0485446b 100644 --- a/dummies/helperFactory.cpp +++ b/dummies/helperFactory.cpp @@ -41,7 +41,7 @@ #include "mission/system/acs/acsModeTree.h" #include "mission/system/com/comModeTree.h" #include "mission/system/tcs/tcsModeTree.h" -#include "mission/system/tree/payloadModeTree.h" +#include "mission/system/payloadModeTree.h" #include "mission/tcs/defs.h" void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpioIF, diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp index 756dc0af..0165a08c 100644 --- a/linux/ObjectFactory.cpp +++ b/linux/ObjectFactory.cpp @@ -24,14 +24,10 @@ #include "OBSWConfig.h" #include "devConf.h" -#include "devices/addresses.h" #include "devices/gpioIds.h" -#include "eive/definitions.h" #include "mission/system/acs/acsModeTree.h" +#include "mission/system/payloadModeTree.h" #include "mission/system/power/epsModeTree.h" -#include "mission/system/tcs/tcsModeTree.h" -#include "mission/system/tree/payloadModeTree.h" -#include "mission/tcs/defs.h" void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF, PowerSwitchIF& pwrSwitcher, std::string spiDev, diff --git a/mission/system/systemTree.cpp b/mission/system/systemTree.cpp index eeb0c08c..f636b248 100644 --- a/mission/system/systemTree.cpp +++ b/mission/system/systemTree.cpp @@ -6,15 +6,13 @@ #include #include -#include - #include "eive/objects.h" #include "mission/com/defs.h" #include "mission/sysDefs.h" #include "mission/system/acs/acsModeTree.h" +#include "mission/system/payloadModeTree.h" #include "mission/system/power/epsModeTree.h" #include "mission/system/tcs/tcsModeTree.h" -#include "mission/system/tree/payloadModeTree.h" #include "treeUtil.h" namespace {