a lot of internal include replacements

2021-07-13 20:22:54 +02:00
parent ca297a7dcd
commit 936d0e9f0c
163 changed files with 558 additions and 563 deletions
--- a/src/core/devicehandlers/AssemblyBase.cpp
+++ b/src/core/devicehandlers/AssemblyBase.cpp
@ -1,4 +1,4 @@
-#include "AssemblyBase.h"
+#include "fsfw/devicehandlers/AssemblyBase.h"

 AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
 		uint16_t commandQueueDepth) :
--- a/src/core/devicehandlers/CMakeLists.txt
+++ b/src/core/devicehandlers/CMakeLists.txt
@ -0,0 +1,10 @@
+target_sources(${LIB_FSFW_NAME} PRIVATE 
+    AssemblyBase.cpp
+    ChildHandlerBase.cpp
+    ChildHandlerFDIR.cpp
+    DeviceHandlerBase.cpp
+    DeviceHandlerFailureIsolation.cpp
+    DeviceHandlerMessage.cpp
+    DeviceTmReportingWrapper.cpp
+    HealthDevice.cpp
+)
--- a/src/core/devicehandlers/ChildHandlerBase.cpp
+++ b/src/core/devicehandlers/ChildHandlerBase.cpp
@ -1,5 +1,5 @@
-#include "ChildHandlerBase.h"
-#include "../subsystem/SubsystemBase.h"
+#include "fsfw/devicehandlers/ChildHandlerBase.h"
+#include "fsfw/subsystem/SubsystemBase.h"

 ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
 		object_id_t deviceCommunication, CookieIF * cookie,
--- a/src/core/devicehandlers/ChildHandlerFDIR.cpp
+++ b/src/core/devicehandlers/ChildHandlerFDIR.cpp
@ -1,4 +1,4 @@
-#include "ChildHandlerFDIR.h"
+#include "fsfw/devicehandlers/ChildHandlerFDIR.h"

 ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner,
        object_id_t faultTreeParent, uint32_t recoveryCount) :
--- a/src/core/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/core/devicehandlers/DeviceHandlerBase.cpp
@ -1,17 +1,17 @@
-#include "DeviceHandlerBase.h"
-#include "AcceptsDeviceResponsesIF.h"
-#include "DeviceTmReportingWrapper.h"
+#include "fsfw/devicehandlers/DeviceHandlerBase.h"
+#include "fsfw/devicehandlers/AcceptsDeviceResponsesIF.h"
+#include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"

-#include "../serviceinterface/ServiceInterface.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../thermal/ThermalComponentIF.h"
-#include "../globalfunctions/CRC.h"
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../ipc/MessageQueueMessage.h"
-#include "../ipc/QueueFactory.h"
-#include "../subsystem/SubsystemBase.h"
-#include "../datapoollocal/LocalPoolVariable.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/thermal/ThermalComponentIF.h"
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/subsystem/SubsystemBase.h"
+#include "fsfw/datapoollocal/LocalPoolVariable.h"

 object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
 object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT;
--- a/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp
+++ b/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp
@ -1,12 +1,12 @@
-#include "DeviceHandlerFailureIsolation.h"
+#include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h"

-#include "../devicehandlers/DeviceHandlerIF.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../modes/HasModesIF.h"
-#include "../health/HealthTableIF.h"
-#include "../power/Fuse.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../thermal/ThermalComponentIF.h"
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/modes/HasModesIF.h"
+#include "fsfw/health/HealthTableIF.h"
+#include "fsfw/power/Fuse.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/thermal/ThermalComponentIF.h"

 object_id_t DeviceHandlerFailureIsolation::powerConfirmationId =
        objects::NO_OBJECT;
--- a/src/core/devicehandlers/DeviceHandlerMessage.cpp
+++ b/src/core/devicehandlers/DeviceHandlerMessage.cpp
@ -1,5 +1,5 @@
-#include "DeviceHandlerMessage.h"
-#include "../objectmanager/ObjectManager.h"
+#include "fsfw/devicehandlers/DeviceHandlerMessage.h"
+#include "fsfw/objectmanager/ObjectManager.h"

 store_address_t DeviceHandlerMessage::getStoreAddress(
 		const CommandMessage* message) {
--- a/src/core/devicehandlers/DeviceTmReportingWrapper.cpp
+++ b/src/core/devicehandlers/DeviceTmReportingWrapper.cpp
@ -1,5 +1,5 @@
-#include "DeviceTmReportingWrapper.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"
+#include "fsfw/serialize/SerializeAdapter.h"

 DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
 		ActionId_t actionId, SerializeIF* data) :
--- a/src/core/devicehandlers/HealthDevice.cpp
+++ b/src/core/devicehandlers/HealthDevice.cpp
@ -1,5 +1,5 @@
-#include "HealthDevice.h"
-#include "../ipc/QueueFactory.h"
+#include "fsfw/devicehandlers/HealthDevice.h"
+#include "fsfw/ipc/QueueFactory.h"

 HealthDevice::HealthDevice(object_id_t setObjectId,
 		MessageQueueId_t parentQueue) :