From 66a79cb86c061a7113a43a21035f1fdb1e082729 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 13 Jul 2021 21:02:53 +0200 Subject: [PATCH] done --- .../tmtcpacket/pus/tc/TcPacketStoredPus.cpp | 4 ++-- .../tmtcpacket/pus/tm/TmPacketStoredPusC.cpp | 6 +++--- src/osal/common/TcpIpBase.cpp | 4 ++-- src/osal/common/TcpTmTcBridge.cpp | 15 +++++++------- src/osal/common/TcpTmTcServer.cpp | 20 +++++++++---------- src/osal/common/UdpTcPollingTask.cpp | 13 ++++++------ src/osal/common/UdpTmTcBridge.cpp | 10 +++++----- src/osal/linux/PeriodicPosixTask.cpp | 8 ++++---- src/osal/linux/PosixThread.cpp | 6 +++--- src/osal/linux/unixUtility.cpp | 6 +++--- 10 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp b/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp index 426aafdb..5ea9f5b1 100644 --- a/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp +++ b/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp @@ -1,6 +1,6 @@ -#include "TcPacketStoredPus.h" +#include "fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h" -#include "../../../serviceinterface/ServiceInterface.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include diff --git a/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp b/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp index 6f8f7fa2..add4f4b9 100644 --- a/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp +++ b/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp @@ -1,7 +1,7 @@ -#include "TmPacketStoredPusC.h" +#include "fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h" -#include "../../../serviceinterface/ServiceInterface.h" -#include "../../../tmtcservices/TmTcMessage.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tmtcservices/TmTcMessage.h" #include diff --git a/src/osal/common/TcpIpBase.cpp b/src/osal/common/TcpIpBase.cpp index 0b37e38c..b6b64e13 100644 --- a/src/osal/common/TcpIpBase.cpp +++ b/src/osal/common/TcpIpBase.cpp @@ -1,5 +1,5 @@ -#include "TcpIpBase.h" -#include "../../platform.h" +#include "fsfw/osal/common/TcpIpBase.h" +#include "fsfw/platform.h" #ifdef PLATFORM_UNIX #include diff --git a/src/osal/common/TcpTmTcBridge.cpp b/src/osal/common/TcpTmTcBridge.cpp index 24fab9a9..24f1a281 100644 --- a/src/osal/common/TcpTmTcBridge.cpp +++ b/src/osal/common/TcpTmTcBridge.cpp @@ -1,15 +1,16 @@ -#include "TcpTmTcBridge.h" -#include "tcpipHelpers.h" +#include "fsfw/platform.h" +#include "fsfw/osal/common/TcpTmTcBridge.h" +#include "fsfw/osal/common/tcpipHelpers.h" -#include -#include -#include +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/ipc/MutexGuard.h" +#include "fsfw/osal/common/TcpTmTcBridge.h" -#ifdef _WIN32 +#ifdef PLATFORM_WIN #include -#elif defined(__unix__) +#elif defined PLATFORM_UNIX #include #include diff --git a/src/osal/common/TcpTmTcServer.cpp b/src/osal/common/TcpTmTcServer.cpp index 38f72647..f94449bb 100644 --- a/src/osal/common/TcpTmTcServer.cpp +++ b/src/osal/common/TcpTmTcServer.cpp @@ -1,15 +1,15 @@ -#include "TcpTmTcServer.h" -#include "TcpTmTcBridge.h" -#include "tcpipHelpers.h" +#include "fsfw/osal/common/TcpTmTcServer.h" +#include "fsfw/osal/common/TcpTmTcBridge.h" +#include "fsfw/osal/common/tcpipHelpers.h" -#include "../../platform.h" -#include "../../container/SharedRingBuffer.h" -#include "../../ipc/MessageQueueSenderIF.h" -#include "../../ipc/MutexGuard.h" -#include "../../objectmanager/ObjectManager.h" +#include "fsfw/platform.h" +#include "fsfw/container/SharedRingBuffer.h" +#include "fsfw/ipc/MessageQueueSenderIF.h" +#include "fsfw/ipc/MutexGuard.h" +#include "fsfw/objectmanager/ObjectManager.h" -#include "../../serviceinterface/ServiceInterface.h" -#include "../../tmtcservices/TmTcMessage.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tmtcservices/TmTcMessage.h" #ifdef PLATFORM_WIN #include diff --git a/src/osal/common/UdpTcPollingTask.cpp b/src/osal/common/UdpTcPollingTask.cpp index 4453e1bc..35e086ee 100644 --- a/src/osal/common/UdpTcPollingTask.cpp +++ b/src/osal/common/UdpTcPollingTask.cpp @@ -1,9 +1,10 @@ -#include "UdpTcPollingTask.h" -#include "tcpipHelpers.h" -#include "../../platform.h" -#include "../../globalfunctions/arrayprinter.h" -#include "../../serviceinterface/ServiceInterface.h" -#include "../../objectmanager/ObjectManager.h" +#include "fsfw/osal/common/UdpTcPollingTask.h" +#include "fsfw/osal/common/tcpipHelpers.h" + +#include "fsfw/platform.h" +#include "fsfw/globalfunctions/arrayprinter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" #ifdef PLATFORM_WIN #include diff --git a/src/osal/common/UdpTmTcBridge.cpp b/src/osal/common/UdpTmTcBridge.cpp index 4c83385b..7015cf4a 100644 --- a/src/osal/common/UdpTmTcBridge.cpp +++ b/src/osal/common/UdpTmTcBridge.cpp @@ -1,9 +1,9 @@ -#include "UdpTmTcBridge.h" -#include "tcpipHelpers.h" +#include "fsfw/osal/common/UdpTmTcBridge.h" +#include "fsfw/osal/common/tcpipHelpers.h" -#include "../../platform.h" -#include "../../serviceinterface/ServiceInterface.h" -#include "../../ipc/MutexGuard.h" +#include "fsfw/platform.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/ipc/MutexGuard.h" #ifdef PLATFORM_WIN #include diff --git a/src/osal/linux/PeriodicPosixTask.cpp b/src/osal/linux/PeriodicPosixTask.cpp index c0152bec..0603cf6a 100644 --- a/src/osal/linux/PeriodicPosixTask.cpp +++ b/src/osal/linux/PeriodicPosixTask.cpp @@ -1,8 +1,8 @@ -#include "PeriodicPosixTask.h" +#include "fsfw/osal/linux/PeriodicPosixTask.h" -#include "../../objectmanager/ObjectManager.h" -#include "../../tasks/ExecutableObjectIF.h" -#include "../../serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include diff --git a/src/osal/linux/PosixThread.cpp b/src/osal/linux/PosixThread.cpp index 36501282..5ca41d73 100644 --- a/src/osal/linux/PosixThread.cpp +++ b/src/osal/linux/PosixThread.cpp @@ -1,7 +1,7 @@ -#include "PosixThread.h" -#include "unixUtility.h" +#include "fsfw/osal/linux/PosixThread.h" +#include "fsfw/osal/linux/unixUtility.h" -#include "../../serviceinterface/ServiceInterface.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include #include diff --git a/src/osal/linux/unixUtility.cpp b/src/osal/linux/unixUtility.cpp index d7aab4ba..40d8c212 100644 --- a/src/osal/linux/unixUtility.cpp +++ b/src/osal/linux/unixUtility.cpp @@ -1,6 +1,6 @@ -#include "FSFWConfig.h" -#include "unixUtility.h" -#include "../../serviceinterface/ServiceInterface.h" +#include "fsfw/FSFW.h" +#include "fsfw/osal/linux/unixUtility.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include #include