From 936d0e9f0ce217709cf71ddc9be502526cf03e01 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 13 Jul 2021 20:22:54 +0200 Subject: [PATCH] a lot of internal include replacements --- CMakeLists.txt | 3 +++ hal/src/linux/uart/CMakeLists.txt | 4 --- inc/fsfw/action.h | 11 ++++++++ inc/fsfw/action/ActionMessage.h | 6 ++--- inc/fsfw/action/CommandActionHelper.h | 10 +++---- inc/fsfw/container/SharedRingBuffer.h | 7 ++--- inc/fsfw/controller/ControllerBase.h | 16 ++++++------ inc/fsfw/controller/ExtendedControllerBase.h | 7 +++-- .../coordinates/CoordinateTransformations.h | 2 +- inc/fsfw/coordinates/Sgp4Propagator.h | 7 ++--- inc/fsfw/datalinklayer/Clcw.h | 7 ----- inc/fsfw/datalinklayer/Farm1StateLockout.h | 7 ----- inc/fsfw/datapool/HkSwitchHelper.h | 6 ++--- inc/fsfw/datapool/PoolDataSetBase.h | 5 ++-- inc/fsfw/datapoollocal/LocalDataPoolManager.h | 22 ++++++++-------- inc/fsfw/datapoollocal/LocalPoolDataSetBase.h | 4 +-- inc/fsfw/datapoollocal/LocalPoolObjectBase.h | 6 ++--- .../internal/LocalDpManagerAttorney.h | 0 inc/fsfw/devicehandlers/HealthDevice.h | 10 +++---- inc/fsfw/events/EventMessage.h | 10 +++---- inc/fsfw/fdir/FaultCounter.h | 10 +++---- inc/fsfw/globalfunctions/Type.h | 5 ++-- inc/fsfw/health/HealthMessage.h | 2 +- inc/fsfw/housekeeping/HousekeepingMessage.h | 10 +++---- .../housekeeping/PeriodicHousekeepingHelper.h | 2 +- .../InternalErrorDataset.h | 0 .../InternalErrorReporter.h | 12 ++++----- .../InternalErrorReporterIF.h | 0 inc/fsfw/ipc/MessageQueueMessage.h | 2 +- inc/fsfw/modes/ModeHelper.h | 6 ++--- inc/fsfw/objectmanager/SystemObject.h | 6 ++--- inc/fsfw/power/PowerComponent.h | 4 +-- inc/fsfw/power/PowerSensor.h | 12 ++++----- inc/fsfw/serialize/SerialBufferAdapter.h | 4 +-- inc/fsfw/storagemanager/LocalPool.h | 13 +++++----- .../subsystem/modes/ModeSequenceMessage.h | 4 +-- inc/fsfw/tasks/FixedSequenceSlot.h | 2 +- inc/fsfw/tcdistribution/PUSDistributor.h | 8 +++--- inc/fsfw/tcdistribution/TcDistributor.h | 14 +++++----- inc/fsfw/thermal/AbstractTemperatureSensor.h | 12 ++++----- inc/fsfw/thermal/Heater.h | 11 ++++---- inc/fsfw/timemanager/Clock.h | 6 ++--- .../packetmatcher/PacketMatchTree.h | 8 +++--- inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h | 2 +- .../tmtcpacket/pus/tm/TmPacketStoredBase.h | 10 +++---- inc/fsfw/tmtcservices/CommandingServiceBase.h | 19 +++++++------- inc/fsfw/tmtcservices/PusServiceBase.h | 12 ++++----- inc/fsfw/tmtcservices/PusVerificationReport.h | 6 ++--- src/core/CMakeLists.txt | 3 +-- src/core/action/ActionHelper.cpp | 9 +++---- src/core/action/ActionMessage.cpp | 7 +++-- src/core/action/CommandActionHelper.cpp | 7 ++--- src/core/action/SimpleActionHelper.cpp | 3 +-- src/core/container/SharedRingBuffer.cpp | 6 ++--- src/core/container/SimpleRingBuffer.cpp | 3 ++- src/core/controller/ControllerBase.cpp | 10 +++---- .../controller/ExtendedControllerBase.cpp | 3 +-- src/core/datapool/HkSwitchHelper.cpp | 4 +-- src/core/datapool/PoolDataSetBase.cpp | 6 ++--- src/core/datapool/PoolEntry.cpp | 7 ++--- .../datapoollocal/LocalDataPoolManager.cpp | 22 +++++++--------- src/core/datapoollocal/LocalDataSet.cpp | 7 ++--- .../datapoollocal/LocalPoolDataSetBase.cpp | 15 +++++------ .../datapoollocal/LocalPoolObjectBase.cpp | 10 +++---- src/core/datapoollocal/SharedLocalDataSet.cpp | 2 +- .../internal/HasLocalDpIFManagerAttorney.cpp | 6 ++--- .../internal/HasLocalDpIFManagerAttorney.h | 2 +- .../internal/HasLocalDpIFUserAttorney.cpp | 4 +-- .../internal/LocalPoolDataSetAttorney.h | 2 +- src/core/devicehandlers/AssemblyBase.cpp | 2 +- src/core/devicehandlers/CMakeLists.txt | 10 +++++++ src/core/devicehandlers/ChildHandlerBase.cpp | 4 +-- src/core/devicehandlers/ChildHandlerFDIR.cpp | 2 +- src/core/devicehandlers/DeviceHandlerBase.cpp | 26 +++++++++---------- .../DeviceHandlerFailureIsolation.cpp | 16 ++++++------ .../devicehandlers/DeviceHandlerMessage.cpp | 4 +-- .../DeviceTmReportingWrapper.cpp | 4 +-- src/core/devicehandlers/HealthDevice.cpp | 4 +-- src/core/events/CMakeLists.txt | 9 +++---- src/core/events/EventManager.cpp | 8 +++--- src/core/events/EventMessage.cpp | 2 +- .../core}/events/eventmatching/CMakeLists.txt | 0 .../eventmatching/EventIdRangeMatcher.cpp | 2 +- .../events/eventmatching/EventMatchTree.cpp | 8 +++--- .../eventmatching/ReporterRangeMatcher.cpp | 2 +- .../eventmatching/SeverityRangeMatcher.cpp | 6 ++--- src/core/fdir/EventCorrelation.cpp | 2 +- src/core/fdir/FailureIsolationBase.cpp | 12 ++++----- src/core/fdir/FaultCounter.cpp | 2 +- src/core/globalfunctions/AsciiConverter.cpp | 3 ++- src/core/globalfunctions/CRC.cpp | 2 +- src/core/globalfunctions/DleEncoder.cpp | 2 +- .../PeriodicOperationDivider.cpp | 2 +- src/core/globalfunctions/Type.cpp | 4 +-- src/core/globalfunctions/arrayprinter.cpp | 5 ++-- src/core/globalfunctions/bitutility.cpp | 2 +- .../math/QuaternionOperations.cpp | 4 +-- .../globalfunctions/timevalOperations.cpp | 2 +- src/core/health/HealthHelper.cpp | 5 ++-- src/core/health/HealthMessage.cpp | 2 +- src/core/health/HealthTable.cpp | 9 ++++--- src/core/housekeeping/CMakeLists.txt | 4 +++ src/core/housekeeping/HousekeepingMessage.cpp | 5 ++-- .../PeriodicHousekeepingHelper.cpp | 4 +-- .../CMakeLists.txt | 0 .../InternalErrorReporter.cpp | 10 +++---- src/core/ipc/CommandMessage.cpp | 5 ++-- src/core/ipc/CommandMessageCleaner.cpp | 22 ++++++++-------- src/core/ipc/MessageQueueMessage.cpp | 7 ++--- src/core/memory/GenericFileSystemMessage.cpp | 6 ++--- src/core/memory/MemoryHelper.cpp | 12 ++++----- src/core/memory/MemoryMessage.cpp | 4 +-- src/core/modes/ModeHelper.cpp | 8 +++--- src/core/modes/ModeMessage.cpp | 2 +- src/core/objectmanager/ObjectManager.cpp | 4 +-- src/core/objectmanager/SystemObject.cpp | 6 ++--- src/core/parameters/ParameterHelper.cpp | 6 ++--- src/core/parameters/ParameterMessage.cpp | 4 +-- src/core/parameters/ParameterWrapper.cpp | 6 ++--- src/core/power/Fuse.cpp | 12 ++++----- src/core/power/PowerComponent.cpp | 4 +-- src/core/power/PowerSensor.cpp | 4 +-- src/core/power/PowerSwitcher.cpp | 6 ++--- src/core/serialize/SerialBufferAdapter.cpp | 4 +-- .../ServiceInterfaceBuffer.cpp | 6 ++--- .../ServiceInterfacePrinter.cpp | 8 +++--- .../ServiceInterfaceStream.cpp | 2 +- .../storagemanager/ConstStorageAccessor.cpp | 8 +++--- src/core/storagemanager/LocalPool.cpp | 6 ++--- src/core/storagemanager/PoolManager.cpp | 5 ++-- src/core/storagemanager/StorageAccessor.cpp | 7 ++--- src/core/subsystem/Subsystem.cpp | 14 +++++----- src/core/subsystem/SubsystemBase.cpp | 8 +++--- .../subsystem/modes/ModeSequenceMessage.cpp | 6 ++--- src/core/subsystem/modes/ModeStore.cpp | 2 +- src/core/tasks/FixedSequenceSlot.cpp | 5 ++-- src/core/tasks/FixedSlotSequence.cpp | 4 +-- src/core/tcdistribution/CCSDSDistributor.cpp | 8 +++--- src/core/tcdistribution/PUSDistributor.cpp | 10 +++---- src/core/tcdistribution/TcDistributor.cpp | 8 +++--- src/core/tcdistribution/TcPacketCheck.cpp | 14 +++++----- .../thermal/AbstractTemperatureSensor.cpp | 4 +-- src/core/thermal/Heater.cpp | 10 +++---- src/core/thermal/RedundantHeater.cpp | 2 +- src/core/thermal/ThermalComponent.cpp | 2 +- src/core/thermal/ThermalModule.cpp | 8 +++--- src/core/timemanager/CCSDSTime.cpp | 5 ++-- src/core/timemanager/ClockCommon.cpp | 4 +-- src/core/timemanager/Countdown.cpp | 2 +- src/core/timemanager/Stopwatch.cpp | 4 +-- src/core/tmtcpacket/SpacePacket.cpp | 12 ++++----- src/core/tmtcpacket/SpacePacketBase.cpp | 5 ++-- .../packetmatcher/PacketMatchTree.cpp | 8 +++--- src/core/tmtcpacket/pus/tc/TcPacketBase.cpp | 8 +++--- .../tmtcservices/CommandingServiceBase.cpp | 19 +++++++------- src/core/tmtcservices/PusServiceBase.cpp | 16 ++++++------ .../tmtcservices/PusVerificationReport.cpp | 4 +-- .../coordinates/CoordinateTransformations.cpp | 17 +++++++----- src/opt/coordinates/Sgp4Propagator.cpp | 15 ++++++----- src/opt/datalinklayer/Clcw.cpp | 13 ++-------- src/opt/datalinklayer/DataLinkLayer.cpp | 6 ++--- src/opt/datalinklayer/Farm1StateLockout.cpp | 16 +++--------- src/opt/datalinklayer/Farm1StateOpen.cpp | 18 +++---------- 163 files changed, 558 insertions(+), 563 deletions(-) create mode 100644 inc/fsfw/action.h rename {src/core => inc/fsfw}/datapoollocal/internal/LocalDpManagerAttorney.h (100%) rename inc/fsfw/{internalError => internalerror}/InternalErrorDataset.h (100%) rename inc/fsfw/{internalError => internalerror}/InternalErrorReporter.h (91%) rename inc/fsfw/{internalError => internalerror}/InternalErrorReporterIF.h (100%) create mode 100644 src/core/devicehandlers/CMakeLists.txt rename {inc/fsfw => src/core}/events/eventmatching/CMakeLists.txt (100%) rename {inc/fsfw => src/core}/events/eventmatching/EventIdRangeMatcher.cpp (84%) rename {inc/fsfw => src/core}/events/eventmatching/EventMatchTree.cpp (94%) rename {inc/fsfw => src/core}/events/eventmatching/ReporterRangeMatcher.cpp (84%) rename {inc/fsfw => src/core}/events/eventmatching/SeverityRangeMatcher.cpp (70%) create mode 100644 src/core/housekeeping/CMakeLists.txt rename src/core/{internalError => internalerror}/CMakeLists.txt (100%) rename src/core/{internalError => internalerror}/InternalErrorReporter.cpp (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1efb856f..021c3d0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON) set(LIB_FSFW_NAME fsfw) add_library(${LIB_FSFW_NAME}) +set(FSFW_CORE_INC_PATH "inc") set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux rtems freertos) @@ -154,6 +155,7 @@ endif() target_include_directories(${LIB_FSFW_NAME} INTERFACE ${CMAKE_SOURCE_DIR} ${FSFW_CONFIG_PATH_ABSOLUTE} + ${FSFW_CORE_INC_PATH} ${FSFW_ADD_INC_PATHS_ABS} ) @@ -163,6 +165,7 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE target_include_directories(${LIB_FSFW_NAME} PRIVATE ${CMAKE_SOURCE_DIR} ${FSFW_CONFIG_PATH_ABSOLUTE} + ${FSFW_CORE_INC_PATH} ${FSFW_ADD_INC_PATHS_ABS} ) diff --git a/hal/src/linux/uart/CMakeLists.txt b/hal/src/linux/uart/CMakeLists.txt index 7b503d02..d8cea5a8 100644 --- a/hal/src/linux/uart/CMakeLists.txt +++ b/hal/src/linux/uart/CMakeLists.txt @@ -2,7 +2,3 @@ target_sources(${TARGET_NAME} PUBLIC UartComIF.cpp UartCookie.cpp ) - - - - diff --git a/inc/fsfw/action.h b/inc/fsfw/action.h new file mode 100644 index 00000000..543ccb0c --- /dev/null +++ b/inc/fsfw/action.h @@ -0,0 +1,11 @@ +#ifndef FSFW_INC_FSFW_ACTION_H_ +#define FSFW_INC_FSFW_ACTION_H_ + +#include "action/ActionHelper.h" +#include "action/ActionMessage.h" +#include "action/CommandActionHelper.h" +#include "action/HasActionsIF.h" +#include "action/CommandsActionsIF.h" +#include "action/SimpleActionHelper.h" + +#endif /* FSFW_INC_FSFW_ACTION_H_ */ diff --git a/inc/fsfw/action/ActionMessage.h b/inc/fsfw/action/ActionMessage.h index 0c64588c..c7570c9d 100644 --- a/inc/fsfw/action/ActionMessage.h +++ b/inc/fsfw/action/ActionMessage.h @@ -1,9 +1,9 @@ #ifndef FSFW_ACTION_ACTIONMESSAGE_H_ #define FSFW_ACTION_ACTIONMESSAGE_H_ -#include "../ipc/CommandMessage.h" -#include "../objectmanager/ObjectManagerIF.h" -#include "../storagemanager/StorageManagerIF.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" +#include "fsfw/storagemanager/StorageManagerIF.h" using ActionId_t = uint32_t; diff --git a/inc/fsfw/action/CommandActionHelper.h b/inc/fsfw/action/CommandActionHelper.h index 96ef1763..ce297e66 100644 --- a/inc/fsfw/action/CommandActionHelper.h +++ b/inc/fsfw/action/CommandActionHelper.h @@ -2,11 +2,11 @@ #define COMMANDACTIONHELPER_H_ #include "ActionMessage.h" -#include "../objectmanager/ObjectManagerIF.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../serialize/SerializeIF.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/serialize/SerializeIF.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/ipc/MessageQueueIF.h" class CommandsActionsIF; diff --git a/inc/fsfw/container/SharedRingBuffer.h b/inc/fsfw/container/SharedRingBuffer.h index 9d6ea56c..26aa45c1 100644 --- a/inc/fsfw/container/SharedRingBuffer.h +++ b/inc/fsfw/container/SharedRingBuffer.h @@ -3,9 +3,10 @@ #include "SimpleRingBuffer.h" #include "DynamicFIFO.h" -#include "../ipc/MutexIF.h" -#include "../objectmanager/SystemObject.h" -#include "../timemanager/Clock.h" + +#include "fsfw/ipc/MutexIF.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/timemanager/Clock.h" /** * @brief Ring buffer which can be shared among multiple objects diff --git a/inc/fsfw/controller/ControllerBase.h b/inc/fsfw/controller/ControllerBase.h index f583342f..1efe0cc1 100644 --- a/inc/fsfw/controller/ControllerBase.h +++ b/inc/fsfw/controller/ControllerBase.h @@ -1,14 +1,14 @@ #ifndef FSFW_CONTROLLER_CONTROLLERBASE_H_ #define FSFW_CONTROLLER_CONTROLLERBASE_H_ -#include "../health/HasHealthIF.h" -#include "../health/HealthHelper.h" -#include "../modes/HasModesIF.h" -#include "../modes/ModeHelper.h" -#include "../objectmanager/SystemObject.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../tasks/PeriodicTaskIF.h" -#include "../datapool/HkSwitchHelper.h" +#include "fsfw/health/HasHealthIF.h" +#include "fsfw/health/HealthHelper.h" +#include "fsfw/modes/HasModesIF.h" +#include "fsfw/modes/ModeHelper.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/tasks/PeriodicTaskIF.h" +#include "fsfw/datapool/HkSwitchHelper.h" /** * @brief Generic base class for controller classes diff --git a/inc/fsfw/controller/ExtendedControllerBase.h b/inc/fsfw/controller/ExtendedControllerBase.h index 63c350e2..4172e03e 100644 --- a/inc/fsfw/controller/ExtendedControllerBase.h +++ b/inc/fsfw/controller/ExtendedControllerBase.h @@ -3,10 +3,9 @@ #include "ControllerBase.h" -#include "../action/HasActionsIF.h" -#include "../datapoollocal/HasLocalDataPoolIF.h" -#include "../action/ActionHelper.h" -#include "../datapoollocal/LocalDataPoolManager.h" +#include "fsfw/action.h" +#include "fsfw/datapoollocal/HasLocalDataPoolIF.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" /** * @brief Extendes the basic ControllerBase with the common components diff --git a/inc/fsfw/coordinates/CoordinateTransformations.h b/inc/fsfw/coordinates/CoordinateTransformations.h index 09ea2c48..a22e0bd4 100644 --- a/inc/fsfw/coordinates/CoordinateTransformations.h +++ b/inc/fsfw/coordinates/CoordinateTransformations.h @@ -1,7 +1,7 @@ #ifndef COORDINATETRANSFORMATIONS_H_ #define COORDINATETRANSFORMATIONS_H_ -#include "../timemanager/Clock.h" +#include "fsfw/timemanager/Clock.h" #include class CoordinateTransformations { diff --git a/inc/fsfw/coordinates/Sgp4Propagator.h b/inc/fsfw/coordinates/Sgp4Propagator.h index f813c6f4..53c5d3e5 100644 --- a/inc/fsfw/coordinates/Sgp4Propagator.h +++ b/inc/fsfw/coordinates/Sgp4Propagator.h @@ -1,11 +1,12 @@ #ifndef SGP4PROPAGATOR_H_ #define SGP4PROPAGATOR_H_ -#ifndef WIN32 +#include "fsfw/platform.h" +#ifndef PLATFORM_WIN #include #endif -#include "../contrib/sgp4/sgp4unit.h" -#include "../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/contrib/sgp4/sgp4unit.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" class Sgp4Propagator { public: diff --git a/inc/fsfw/datalinklayer/Clcw.h b/inc/fsfw/datalinklayer/Clcw.h index 8116d63b..f6c77230 100644 --- a/inc/fsfw/datalinklayer/Clcw.h +++ b/inc/fsfw/datalinklayer/Clcw.h @@ -1,10 +1,3 @@ -/** - * @file Clcw.h - * @brief This file defines the Clcw class. - * @date 17.04.2013 - * @author baetz - */ - #ifndef CLCW_H_ #define CLCW_H_ diff --git a/inc/fsfw/datalinklayer/Farm1StateLockout.h b/inc/fsfw/datalinklayer/Farm1StateLockout.h index 63cdc4d2..28abf4e6 100644 --- a/inc/fsfw/datalinklayer/Farm1StateLockout.h +++ b/inc/fsfw/datalinklayer/Farm1StateLockout.h @@ -1,10 +1,3 @@ -/** - * @file Farm1StateLockout.h - * @brief This file defines the Farm1StateLockout class. - * @date 24.04.2013 - * @author baetz - */ - #ifndef FARM1STATELOCKOUT_H_ #define FARM1STATELOCKOUT_H_ diff --git a/inc/fsfw/datapool/HkSwitchHelper.h b/inc/fsfw/datapool/HkSwitchHelper.h index bb9e7dc6..611c5d86 100644 --- a/inc/fsfw/datapool/HkSwitchHelper.h +++ b/inc/fsfw/datapool/HkSwitchHelper.h @@ -1,9 +1,9 @@ #ifndef FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ #define FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ -#include "../tasks/ExecutableObjectIF.h" -#include "../action/CommandsActionsIF.h" -#include "../events/EventReportingProxyIF.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/action/CommandsActionsIF.h" +#include "fsfw/events/EventReportingProxyIF.h" //TODO this class violations separation between mission and framework //but it is only a transitional solution until the Datapool is diff --git a/inc/fsfw/datapool/PoolDataSetBase.h b/inc/fsfw/datapool/PoolDataSetBase.h index 043c860a..36cf2a30 100644 --- a/inc/fsfw/datapool/PoolDataSetBase.h +++ b/inc/fsfw/datapool/PoolDataSetBase.h @@ -3,8 +3,9 @@ #include "PoolDataSetIF.h" #include "PoolVariableIF.h" -#include "../serialize/SerializeIF.h" -#include "../ipc/MutexIF.h" + +#include "fsfw/serialize/SerializeIF.h" +#include "fsfw/ipc/MutexIF.h" /** * @brief The DataSetBase class manages a set of locally checked out variables. diff --git a/inc/fsfw/datapoollocal/LocalDataPoolManager.h b/inc/fsfw/datapoollocal/LocalDataPoolManager.h index 2ec81f1c..9f91613b 100644 --- a/inc/fsfw/datapoollocal/LocalDataPoolManager.h +++ b/inc/fsfw/datapoollocal/LocalDataPoolManager.h @@ -4,17 +4,17 @@ #include "ProvidesDataPoolSubscriptionIF.h" #include "AccessLocalPoolF.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../housekeeping/HousekeepingPacketDownlink.h" -#include "../housekeeping/HousekeepingMessage.h" -#include "../housekeeping/PeriodicHousekeepingHelper.h" -#include "../datapool/DataSetIF.h" -#include "../datapool/PoolEntry.h" -#include "../objectmanager/SystemObjectIF.h" -#include "../ipc/MutexIF.h" -#include "../ipc/CommandMessage.h" -#include "../ipc/MessageQueueIF.h" -#include "../ipc/MutexGuard.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/housekeeping/HousekeepingPacketDownlink.h" +#include "fsfw/housekeeping/HousekeepingMessage.h" +#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h" +#include "fsfw/datapool/DataSetIF.h" +#include "fsfw/datapool/PoolEntry.h" +#include "fsfw/objectmanager/SystemObjectIF.h" +#include "fsfw/ipc/MutexIF.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/ipc/MessageQueueIF.h" +#include "fsfw/ipc/MutexGuard.h" #include #include diff --git a/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h b/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h index ab67dc3f..822e2cb8 100644 --- a/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h +++ b/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h @@ -4,8 +4,8 @@ #include "MarkChangedIF.h" #include "localPoolDefinitions.h" -#include "../datapool/DataSetIF.h" -#include "../datapool/PoolDataSetBase.h" +#include "fsfw/datapool/DataSetIF.h" +#include "fsfw/datapool/PoolDataSetBase.h" #include diff --git a/inc/fsfw/datapoollocal/LocalPoolObjectBase.h b/inc/fsfw/datapoollocal/LocalPoolObjectBase.h index 3f7fb6dd..72275646 100644 --- a/inc/fsfw/datapoollocal/LocalPoolObjectBase.h +++ b/inc/fsfw/datapoollocal/LocalPoolObjectBase.h @@ -4,9 +4,9 @@ #include "MarkChangedIF.h" #include "localPoolDefinitions.h" -#include "../objectmanager/SystemObjectIF.h" -#include "../datapool/PoolVariableIF.h" -#include "../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/objectmanager/SystemObjectIF.h" +#include "fsfw/datapool/PoolVariableIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" class LocalDataPoolManager; class DataSetIF; diff --git a/src/core/datapoollocal/internal/LocalDpManagerAttorney.h b/inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h similarity index 100% rename from src/core/datapoollocal/internal/LocalDpManagerAttorney.h rename to inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h diff --git a/inc/fsfw/devicehandlers/HealthDevice.h b/inc/fsfw/devicehandlers/HealthDevice.h index 738f0c7e..bf9cdb82 100644 --- a/inc/fsfw/devicehandlers/HealthDevice.h +++ b/inc/fsfw/devicehandlers/HealthDevice.h @@ -1,11 +1,11 @@ #ifndef FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_ #define FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_ -#include "../health/HasHealthIF.h" -#include "../health/HealthHelper.h" -#include "../objectmanager/SystemObject.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/health/HasHealthIF.h" +#include "fsfw/health/HealthHelper.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/ipc/MessageQueueIF.h" class HealthDevice: public SystemObject, public ExecutableObjectIF, diff --git a/inc/fsfw/events/EventMessage.h b/inc/fsfw/events/EventMessage.h index f2f5ffb5..36e261bd 100644 --- a/inc/fsfw/events/EventMessage.h +++ b/inc/fsfw/events/EventMessage.h @@ -1,9 +1,9 @@ -#ifndef EVENTMESSAGE_H_ -#define EVENTMESSAGE_H_ +#ifndef FSFW_EVENTS_EVENTMESSAGE_H_ +#define FSFW_EVENTS_EVENTMESSAGE_H_ #include "Event.h" -#include "../ipc/MessageQueueMessage.h" -#include "../objectmanager/ObjectManagerIF.h" +#include "fsfw/ipc/MessageQueueMessage.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" /** * Passing on events through IPC. @@ -49,4 +49,4 @@ protected: }; -#endif /* EVENTMESSAGE_H_ */ +#endif /* FSFW_EVENTS_EVENTMESSAGE_H_ */ diff --git a/inc/fsfw/fdir/FaultCounter.h b/inc/fsfw/fdir/FaultCounter.h index e0670c4b..a85e8cf7 100644 --- a/inc/fsfw/fdir/FaultCounter.h +++ b/inc/fsfw/fdir/FaultCounter.h @@ -1,8 +1,8 @@ -#ifndef FRAMEWORK_FDIR_FAULTCOUNTER_H_ -#define FRAMEWORK_FDIR_FAULTCOUNTER_H_ +#ifndef FSFW_FDIR_FAULTCOUNTER_H_ +#define FSFW_FDIR_FAULTCOUNTER_H_ -#include "../parameters/HasParametersIF.h" -#include "../timemanager/Countdown.h" +#include "fsfw/parameters/HasParametersIF.h" +#include "fsfw/timemanager/Countdown.h" class FaultCounter: public HasParametersIF { public: @@ -35,4 +35,4 @@ private: uint32_t failureThreshold; }; -#endif /* FRAMEWORK_FDIR_FAULTCOUNTER_H_ */ +#endif /* FSFW_FDIR_FAULTCOUNTER_H_ */ diff --git a/inc/fsfw/globalfunctions/Type.h b/inc/fsfw/globalfunctions/Type.h index fa894e3e..cfbb3cfa 100644 --- a/inc/fsfw/globalfunctions/Type.h +++ b/inc/fsfw/globalfunctions/Type.h @@ -1,8 +1,9 @@ #ifndef FSFW_GLOBALFUNCTIONS_TYPE_H_ #define FSFW_GLOBALFUNCTIONS_TYPE_H_ -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../serialize/SerializeIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/serialize/SerializeIF.h" + #include /** diff --git a/inc/fsfw/health/HealthMessage.h b/inc/fsfw/health/HealthMessage.h index fb979c66..3dc58977 100644 --- a/inc/fsfw/health/HealthMessage.h +++ b/inc/fsfw/health/HealthMessage.h @@ -2,7 +2,7 @@ #define FSFW_HEALTH_HEALTHMESSAGE_H_ #include "HasHealthIF.h" -#include "../ipc/CommandMessage.h" +#include "fsfw/ipc/CommandMessage.h" class HealthMessage { public: diff --git a/inc/fsfw/housekeeping/HousekeepingMessage.h b/inc/fsfw/housekeeping/HousekeepingMessage.h index a38ff73f..509a68c9 100644 --- a/inc/fsfw/housekeeping/HousekeepingMessage.h +++ b/inc/fsfw/housekeeping/HousekeepingMessage.h @@ -1,11 +1,11 @@ #ifndef FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_ #define FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_ -#include "../datapoollocal/localPoolDefinitions.h" -#include "../ipc/CommandMessage.h" -#include "../ipc/FwMessageTypes.h" -#include "../objectmanager/frameworkObjects.h" -#include "../storagemanager/StorageManagerIF.h" +#include "fsfw/datapoollocal/localPoolDefinitions.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/ipc/FwMessageTypes.h" +#include "fsfw/objectmanager/frameworkObjects.h" +#include "fsfw/storagemanager/StorageManagerIF.h" /** diff --git a/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h b/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h index 3256fbff..4e93308b 100644 --- a/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h +++ b/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h @@ -1,7 +1,7 @@ #ifndef FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_ #define FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_ -#include "../timemanager/Clock.h" +#include "fsfw/timemanager/Clock.h" #include class LocalPoolDataSetBase; diff --git a/inc/fsfw/internalError/InternalErrorDataset.h b/inc/fsfw/internalerror/InternalErrorDataset.h similarity index 100% rename from inc/fsfw/internalError/InternalErrorDataset.h rename to inc/fsfw/internalerror/InternalErrorDataset.h diff --git a/inc/fsfw/internalError/InternalErrorReporter.h b/inc/fsfw/internalerror/InternalErrorReporter.h similarity index 91% rename from inc/fsfw/internalError/InternalErrorReporter.h rename to inc/fsfw/internalerror/InternalErrorReporter.h index 580cb8f6..57a6a135 100644 --- a/inc/fsfw/internalError/InternalErrorReporter.h +++ b/inc/fsfw/internalerror/InternalErrorReporter.h @@ -3,12 +3,12 @@ #include "InternalErrorReporterIF.h" -#include "../tasks/PeriodicTaskIF.h" -#include "../internalError/InternalErrorDataset.h" -#include "../datapoollocal/LocalDataPoolManager.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../objectmanager/SystemObject.h" -#include "../ipc/MutexIF.h" +#include "fsfw/tasks/PeriodicTaskIF.h" +#include "fsfw/internalerror/InternalErrorDataset.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/ipc/MutexIF.h" /** * @brief This class is used to track internal errors like lost telemetry, diff --git a/inc/fsfw/internalError/InternalErrorReporterIF.h b/inc/fsfw/internalerror/InternalErrorReporterIF.h similarity index 100% rename from inc/fsfw/internalError/InternalErrorReporterIF.h rename to inc/fsfw/internalerror/InternalErrorReporterIF.h diff --git a/inc/fsfw/ipc/MessageQueueMessage.h b/inc/fsfw/ipc/MessageQueueMessage.h index 111056ca..e9ef6756 100644 --- a/inc/fsfw/ipc/MessageQueueMessage.h +++ b/inc/fsfw/ipc/MessageQueueMessage.h @@ -1,7 +1,7 @@ #ifndef FSFW_IPC_MESSAGEQUEUEMESSAGE_H_ #define FSFW_IPC_MESSAGEQUEUEMESSAGE_H_ -#include "../ipc/MessageQueueMessageIF.h" +#include "fsfw/ipc/MessageQueueMessageIF.h" #include /** diff --git a/inc/fsfw/modes/ModeHelper.h b/inc/fsfw/modes/ModeHelper.h index c2f089ec..27928a29 100644 --- a/inc/fsfw/modes/ModeHelper.h +++ b/inc/fsfw/modes/ModeHelper.h @@ -2,9 +2,9 @@ #define FSFW_MODES_MODEHELPER_H_ #include "ModeMessage.h" -#include "../ipc/MessageQueueIF.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../timemanager/Countdown.h" +#include "fsfw/ipc/MessageQueueIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/timemanager/Countdown.h" class HasModesIF; diff --git a/inc/fsfw/objectmanager/SystemObject.h b/inc/fsfw/objectmanager/SystemObject.h index d9c4236d..e7d2ae2b 100644 --- a/inc/fsfw/objectmanager/SystemObject.h +++ b/inc/fsfw/objectmanager/SystemObject.h @@ -2,9 +2,9 @@ #define FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_ #include "SystemObjectIF.h" -#include "../events/Event.h" -#include "../events/EventReportingProxyIF.h" -#include "../timemanager/Clock.h" +#include "fsfw/events/Event.h" +#include "fsfw/events/EventReportingProxyIF.h" +#include "fsfw/timemanager/Clock.h" /** * @brief This class automates insertion into the ObjectManager and diff --git a/inc/fsfw/power/PowerComponent.h b/inc/fsfw/power/PowerComponent.h index 6b9778a5..3889a2ae 100644 --- a/inc/fsfw/power/PowerComponent.h +++ b/inc/fsfw/power/PowerComponent.h @@ -3,8 +3,8 @@ #include "PowerComponentIF.h" -#include "../objectmanager/frameworkObjects.h" -#include "../objectmanager/SystemObjectIF.h" +#include "fsfw/objectmanager/frameworkObjects.h" +#include "fsfw/objectmanager/SystemObjectIF.h" class PowerComponent: public PowerComponentIF { diff --git a/inc/fsfw/power/PowerSensor.h b/inc/fsfw/power/PowerSensor.h index 5a21ab10..d00c5420 100644 --- a/inc/fsfw/power/PowerSensor.h +++ b/inc/fsfw/power/PowerSensor.h @@ -1,12 +1,12 @@ #ifndef FSFW_POWER_POWERSENSOR_H_ #define FSFW_POWER_POWERSENSOR_H_ -#include "../datapoollocal/StaticLocalDataSet.h" -#include "../devicehandlers/HealthDevice.h" -#include "../monitoring/LimitMonitor.h" -#include "../parameters/ParameterHelper.h" -#include "../objectmanager/SystemObject.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/datapoollocal/StaticLocalDataSet.h" +#include "fsfw/devicehandlers/HealthDevice.h" +#include "fsfw/monitoring/LimitMonitor.h" +#include "fsfw/parameters/ParameterHelper.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/ipc/MessageQueueIF.h" class PowerController; diff --git a/inc/fsfw/serialize/SerialBufferAdapter.h b/inc/fsfw/serialize/SerialBufferAdapter.h index 9a89e18b..6c79cd03 100644 --- a/inc/fsfw/serialize/SerialBufferAdapter.h +++ b/inc/fsfw/serialize/SerialBufferAdapter.h @@ -1,8 +1,8 @@ #ifndef SERIALBUFFERADAPTER_H_ #define SERIALBUFFERADAPTER_H_ -#include "../serialize/SerializeIF.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/serialize/SerializeIF.h" +#include "fsfw/serialize/SerializeAdapter.h" /** * This adapter provides an interface for SerializeIF to serialize or deserialize diff --git a/inc/fsfw/storagemanager/LocalPool.h b/inc/fsfw/storagemanager/LocalPool.h index 6a666485..383d8a94 100644 --- a/inc/fsfw/storagemanager/LocalPool.h +++ b/inc/fsfw/storagemanager/LocalPool.h @@ -1,12 +1,13 @@ #ifndef FSFW_STORAGEMANAGER_LOCALPOOL_H_ #define FSFW_STORAGEMANAGER_LOCALPOOL_H_ -#include "StorageManagerIF.h" -#include "../objectmanager/SystemObject.h" -#include "../objectmanager/ObjectManagerIF.h" -#include "../serviceinterface/ServiceInterfaceStream.h" -#include "../internalError/InternalErrorReporterIF.h" -#include "../storagemanager/StorageAccessor.h" +#include "fsfw/storagemanager/StorageManagerIF.h" + +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" +#include "fsfw/serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/internalerror/InternalErrorReporterIF.h" +#include "fsfw/storagemanager/StorageAccessor.h" #include #include diff --git a/inc/fsfw/subsystem/modes/ModeSequenceMessage.h b/inc/fsfw/subsystem/modes/ModeSequenceMessage.h index 7852c984..0dbe7ffb 100644 --- a/inc/fsfw/subsystem/modes/ModeSequenceMessage.h +++ b/inc/fsfw/subsystem/modes/ModeSequenceMessage.h @@ -3,8 +3,8 @@ #include "ModeDefinitions.h" -#include "../../ipc/CommandMessage.h" -#include "../../storagemanager/StorageManagerIF.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/storagemanager/StorageManagerIF.h" class ModeSequenceMessage { diff --git a/inc/fsfw/tasks/FixedSequenceSlot.h b/inc/fsfw/tasks/FixedSequenceSlot.h index 1744ec19..aea77dfe 100644 --- a/inc/fsfw/tasks/FixedSequenceSlot.h +++ b/inc/fsfw/tasks/FixedSequenceSlot.h @@ -2,7 +2,7 @@ #define FSFW_TASKS_FIXEDSEQUENCESLOT_H_ #include "ExecutableObjectIF.h" -#include "../objectmanager/ObjectManagerIF.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" class PeriodicTaskIF; diff --git a/inc/fsfw/tcdistribution/PUSDistributor.h b/inc/fsfw/tcdistribution/PUSDistributor.h index c6f863f0..53a996ca 100644 --- a/inc/fsfw/tcdistribution/PUSDistributor.h +++ b/inc/fsfw/tcdistribution/PUSDistributor.h @@ -5,10 +5,10 @@ #include "TcDistributor.h" #include "TcPacketCheck.h" -#include "../tmtcpacket/pus/tc.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../tmtcservices/AcceptsTelecommandsIF.h" -#include "../tmtcservices/VerificationReporter.h" +#include "fsfw/tmtcpacket/pus/tc.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h" +#include "fsfw/tmtcservices/VerificationReporter.h" /** * This class accepts PUS Telecommands and forwards them to Application diff --git a/inc/fsfw/tcdistribution/TcDistributor.h b/inc/fsfw/tcdistribution/TcDistributor.h index 5d0ca45d..14b532bd 100644 --- a/inc/fsfw/tcdistribution/TcDistributor.h +++ b/inc/fsfw/tcdistribution/TcDistributor.h @@ -1,13 +1,13 @@ #ifndef FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_ #define FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_ -#include "../objectmanager/ObjectManagerIF.h" -#include "../objectmanager/SystemObject.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../tmtcservices/TmTcMessage.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/tmtcservices/TmTcMessage.h" +#include "fsfw/ipc/MessageQueueIF.h" #include /** diff --git a/inc/fsfw/thermal/AbstractTemperatureSensor.h b/inc/fsfw/thermal/AbstractTemperatureSensor.h index a1153314..719d84fe 100644 --- a/inc/fsfw/thermal/AbstractTemperatureSensor.h +++ b/inc/fsfw/thermal/AbstractTemperatureSensor.h @@ -1,12 +1,12 @@ #ifndef ABSTRACTSENSOR_H_ #define ABSTRACTSENSOR_H_ -#include "../health/HasHealthIF.h" -#include "../health/HealthHelper.h" -#include "../objectmanager/SystemObject.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../parameters/ParameterHelper.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/health/HasHealthIF.h" +#include "fsfw/health/HealthHelper.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/parameters/ParameterHelper.h" +#include "fsfw/ipc/MessageQueueIF.h" #include "ThermalModuleIF.h" #include "tcsDefinitions.h" diff --git a/inc/fsfw/thermal/Heater.h b/inc/fsfw/thermal/Heater.h index 2caddd85..2a40cac6 100644 --- a/inc/fsfw/thermal/Heater.h +++ b/inc/fsfw/thermal/Heater.h @@ -1,11 +1,12 @@ #ifndef FSFW_THERMAL_HEATER_H_ #define FSFW_THERMAL_HEATER_H_ -#include "../devicehandlers/HealthDevice.h" -#include "../parameters/ParameterHelper.h" -#include "../power/PowerSwitchIF.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../timemanager/Countdown.h" +#include "fsfw/devicehandlers/HealthDevice.h" +#include "fsfw/parameters/ParameterHelper.h" +#include "fsfw/power/PowerSwitchIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/timemanager/Countdown.h" + #include diff --git a/inc/fsfw/timemanager/Clock.h b/inc/fsfw/timemanager/Clock.h index 6a76c86d..b1d6bfaf 100644 --- a/inc/fsfw/timemanager/Clock.h +++ b/inc/fsfw/timemanager/Clock.h @@ -2,9 +2,9 @@ #define FSFW_TIMEMANAGER_CLOCK_H_ #include "clockDefinitions.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../ipc/MutexFactory.h" -#include "../globalfunctions/timevalOperations.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/ipc/MutexFactory.h" +#include "fsfw/globalfunctions/timevalOperations.h" #include diff --git a/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h b/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h index a40b5099..e2439c74 100644 --- a/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h +++ b/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h @@ -1,10 +1,10 @@ #ifndef FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_ #define FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_ -#include "../../container/PlacementFactory.h" -#include "../../globalfunctions/matching/MatchTree.h" -#include "../../storagemanager/LocalPool.h" -#include "../../tmtcpacket/pus/tm/TmPacketMinimal.h" +#include "fsfw/container/PlacementFactory.h" +#include "fsfw/globalfunctions/matching/MatchTree.h" +#include "fsfw/storagemanager/LocalPool.h" +#include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h" class PacketMatchTree: public MatchTree, public HasReturnvaluesIF { public: diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h index e2872246..14356c8c 100644 --- a/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h +++ b/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h @@ -1,7 +1,7 @@ #ifndef TMTCPACKET_PUS_TCPACKETBASE_H_ #define TMTCPACKET_PUS_TCPACKETBASE_H_ -#include "../../../tmtcpacket/SpacePacketBase.h" +#include "fsfw/tmtcpacket/SpacePacketBase.h" #include /** diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h index 1bc092dd..8e8b9c70 100644 --- a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h +++ b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h @@ -1,15 +1,15 @@ #ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_ #define FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_ -#include "../../../FSFW.h" +#include "fsfw/FSFW.h" #include "TmPacketBase.h" #include "TmPacketStoredBase.h" #include "TmPacketPusA.h" -#include "../../../serialize/SerializeIF.h" -#include "../../../storagemanager/StorageManagerIF.h" -#include "../../../internalError/InternalErrorReporterIF.h" -#include "../../../ipc/MessageQueueSenderIF.h" +#include "fsfw/serialize/SerializeIF.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/internalerror/InternalErrorReporterIF.h" +#include "fsfw/ipc/MessageQueueSenderIF.h" /** * This class generates a ECSS PUS Telemetry packet within a given diff --git a/inc/fsfw/tmtcservices/CommandingServiceBase.h b/inc/fsfw/tmtcservices/CommandingServiceBase.h index 4ee4a21a..b6709693 100644 --- a/inc/fsfw/tmtcservices/CommandingServiceBase.h +++ b/inc/fsfw/tmtcservices/CommandingServiceBase.h @@ -3,17 +3,16 @@ #include "AcceptsTelecommandsIF.h" #include "VerificationReporter.h" +#include "fsfw/FSFW.h" -#include "../objectmanager/SystemObject.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../ipc/MessageQueueIF.h" -#include "../ipc/CommandMessage.h" -#include "../container/FixedMap.h" -#include "../container/FIFO.h" -#include "../serialize/SerializeIF.h" - -#include +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/ipc/MessageQueueIF.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/container/FixedMap.h" +#include "fsfw/container/FIFO.h" +#include "fsfw/serialize/SerializeIF.h" class TcPacketStored; class TcPacketStoredBase; diff --git a/inc/fsfw/tmtcservices/PusServiceBase.h b/inc/fsfw/tmtcservices/PusServiceBase.h index 6cde6fb4..ea4147fe 100644 --- a/inc/fsfw/tmtcservices/PusServiceBase.h +++ b/inc/fsfw/tmtcservices/PusServiceBase.h @@ -5,12 +5,12 @@ #include "VerificationCodes.h" #include "VerificationReporter.h" -#include "../objectmanager/ObjectManagerIF.h" -#include "../objectmanager/SystemObject.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../tasks/ExecutableObjectIF.h" -#include "../tmtcpacket/pus/tc.h" -#include "../ipc/MessageQueueIF.h" +#include "fsfw/objectmanager/ObjectManagerIF.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/tasks/ExecutableObjectIF.h" +#include "fsfw/tmtcpacket/pus/tc.h" +#include "fsfw/ipc/MessageQueueIF.h" namespace Factory{ void setStaticFrameworkObjectIds(); diff --git a/inc/fsfw/tmtcservices/PusVerificationReport.h b/inc/fsfw/tmtcservices/PusVerificationReport.h index 0e1732ef..c22ba535 100644 --- a/inc/fsfw/tmtcservices/PusVerificationReport.h +++ b/inc/fsfw/tmtcservices/PusVerificationReport.h @@ -3,9 +3,9 @@ #include "VerificationCodes.h" -#include "../ipc/MessageQueueMessage.h" -#include "../tmtcpacket/pus/tc/TcPacketBase.h" -#include "../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/ipc/MessageQueueMessage.h" +#include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" class PusVerificationMessage: public MessageQueueMessage { private: diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6240d8f2..4a2f7a2c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(fdir) add_subdirectory(globalfunctions) add_subdirectory(health) add_subdirectory(housekeeping) -add_subdirectory(internalError) +add_subdirectory(internalerror) add_subdirectory(ipc) add_subdirectory(memory) add_subdirectory(modes) @@ -24,6 +24,5 @@ add_subdirectory(tasks) add_subdirectory(tcdistribution) add_subdirectory(thermal) add_subdirectory(timemanager) -add_subdirectory(tmstorage) add_subdirectory(tmtcpacket) add_subdirectory(tmtcservices) diff --git a/src/core/action/ActionHelper.cpp b/src/core/action/ActionHelper.cpp index 73007ea3..3dfe8b50 100644 --- a/src/core/action/ActionHelper.cpp +++ b/src/core/action/ActionHelper.cpp @@ -1,9 +1,8 @@ -#include "ActionHelper.h" -#include "HasActionsIF.h" +#include "fsfw/action.h" -#include "../ipc/MessageQueueSenderIF.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/ipc/MessageQueueSenderIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) : diff --git a/src/core/action/ActionMessage.cpp b/src/core/action/ActionMessage.cpp index f25858af..7d66c57f 100644 --- a/src/core/action/ActionMessage.cpp +++ b/src/core/action/ActionMessage.cpp @@ -1,8 +1,7 @@ -#include "ActionMessage.h" -#include "HasActionsIF.h" +#include "fsfw/action.h" -#include "../objectmanager/ObjectManager.h" -#include "../storagemanager/StorageManagerIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/storagemanager/StorageManagerIF.h" ActionMessage::ActionMessage() { } diff --git a/src/core/action/CommandActionHelper.cpp b/src/core/action/CommandActionHelper.cpp index 31650cae..b46dcceb 100644 --- a/src/core/action/CommandActionHelper.cpp +++ b/src/core/action/CommandActionHelper.cpp @@ -1,9 +1,6 @@ -#include "ActionMessage.h" -#include "CommandActionHelper.h" -#include "CommandsActionsIF.h" -#include "HasActionsIF.h" +#include "fsfw/action.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) : owner(setOwner), queueToUse(NULL), ipcStore( diff --git a/src/core/action/SimpleActionHelper.cpp b/src/core/action/SimpleActionHelper.cpp index 8d34f40f..7135ea62 100644 --- a/src/core/action/SimpleActionHelper.cpp +++ b/src/core/action/SimpleActionHelper.cpp @@ -1,5 +1,4 @@ -#include "HasActionsIF.h" -#include "SimpleActionHelper.h" +#include "fsfw/action.h" SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) : diff --git a/src/core/container/SharedRingBuffer.cpp b/src/core/container/SharedRingBuffer.cpp index fe36341d..f7c97802 100644 --- a/src/core/container/SharedRingBuffer.cpp +++ b/src/core/container/SharedRingBuffer.cpp @@ -1,6 +1,6 @@ -#include "SharedRingBuffer.h" -#include "../ipc/MutexFactory.h" -#include "../ipc/MutexGuard.h" +#include "fsfw/container/SharedRingBuffer.h" +#include "fsfw/ipc/MutexFactory.h" +#include "fsfw/ipc/MutexGuard.h" SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size, bool overwriteOld, size_t maxExcessBytes): diff --git a/src/core/container/SimpleRingBuffer.cpp b/src/core/container/SimpleRingBuffer.cpp index 8544acbf..8de9cf08 100644 --- a/src/core/container/SimpleRingBuffer.cpp +++ b/src/core/container/SimpleRingBuffer.cpp @@ -1,4 +1,5 @@ -#include "SimpleRingBuffer.h" +#include "fsfw/container/SimpleRingBuffer.h" + #include SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld, diff --git a/src/core/controller/ControllerBase.cpp b/src/core/controller/ControllerBase.cpp index 5a94c082..86838068 100644 --- a/src/core/controller/ControllerBase.cpp +++ b/src/core/controller/ControllerBase.cpp @@ -1,9 +1,9 @@ -#include "ControllerBase.h" +#include "fsfw/controller/ControllerBase.h" -#include "../subsystem/SubsystemBase.h" -#include "../ipc/QueueFactory.h" -#include "../action/HasActionsIF.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/subsystem/SubsystemBase.h" +#include "fsfw/ipc/QueueFactory.h" +#include "fsfw/action/HasActionsIF.h" +#include "fsfw/objectmanager/ObjectManager.h" ControllerBase::ControllerBase(object_id_t setObjectId, object_id_t parentId, size_t commandQueueDepth) : diff --git a/src/core/controller/ExtendedControllerBase.cpp b/src/core/controller/ExtendedControllerBase.cpp index b5b8c660..f59c50a9 100644 --- a/src/core/controller/ExtendedControllerBase.cpp +++ b/src/core/controller/ExtendedControllerBase.cpp @@ -1,5 +1,4 @@ -#include "ExtendedControllerBase.h" - +#include "fsfw/controller/ExtendedControllerBase.h" ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId, object_id_t parentId, size_t commandQueueDepth): diff --git a/src/core/datapool/HkSwitchHelper.cpp b/src/core/datapool/HkSwitchHelper.cpp index 21e37f59..bcf237ba 100644 --- a/src/core/datapool/HkSwitchHelper.cpp +++ b/src/core/datapool/HkSwitchHelper.cpp @@ -1,5 +1,5 @@ -#include "../datapool/HkSwitchHelper.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/datapool/HkSwitchHelper.h" +#include "fsfw/ipc/QueueFactory.h" HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) : commandActionHelper(this), eventProxy(eventProxy) { diff --git a/src/core/datapool/PoolDataSetBase.cpp b/src/core/datapool/PoolDataSetBase.cpp index 1bd58698..7856dc9a 100644 --- a/src/core/datapool/PoolDataSetBase.cpp +++ b/src/core/datapool/PoolDataSetBase.cpp @@ -1,7 +1,7 @@ -#include "PoolDataSetBase.h" -#include "ReadCommitIFAttorney.h" +#include "fsfw/datapool/PoolDataSetBase.h" +#include "fsfw/datapool/ReadCommitIFAttorney.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include diff --git a/src/core/datapool/PoolEntry.cpp b/src/core/datapool/PoolEntry.cpp index 6504e20c..0443aa11 100644 --- a/src/core/datapool/PoolEntry.cpp +++ b/src/core/datapool/PoolEntry.cpp @@ -1,7 +1,8 @@ -#include "PoolEntry.h" +#include "fsfw/datapool/PoolEntry.h" + +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/globalfunctions/arrayprinter.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../globalfunctions/arrayprinter.h" #include #include diff --git a/src/core/datapoollocal/LocalDataPoolManager.cpp b/src/core/datapoollocal/LocalDataPoolManager.cpp index 71997b9b..4a706657 100644 --- a/src/core/datapoollocal/LocalDataPoolManager.cpp +++ b/src/core/datapoollocal/LocalDataPoolManager.cpp @@ -1,18 +1,16 @@ -#include "HasLocalDataPoolIF.h" -#include "LocalDataPoolManager.h" -#include "LocalPoolObjectBase.h" -#include "LocalPoolDataSetBase.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" +#include "fsfw/datapoollocal.h" #include "internal/LocalPoolDataSetAttorney.h" #include "internal/HasLocalDpIFManagerAttorney.h" -#include "../housekeeping/HousekeepingSetPacket.h" -#include "../objectmanager/ObjectManager.h" -#include "../housekeeping/HousekeepingSnapshot.h" -#include "../housekeeping/AcceptsHkPacketsIF.h" -#include "../timemanager/CCSDSTime.h" -#include "../ipc/MutexFactory.h" -#include "../ipc/MutexGuard.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/housekeeping/HousekeepingSetPacket.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/housekeeping/HousekeepingSnapshot.h" +#include "fsfw/housekeeping/AcceptsHkPacketsIF.h" +#include "fsfw/timemanager/CCSDSTime.h" +#include "fsfw/ipc/MutexFactory.h" +#include "fsfw/ipc/MutexGuard.h" +#include "fsfw/ipc/QueueFactory.h" #include #include diff --git a/src/core/datapoollocal/LocalDataSet.cpp b/src/core/datapoollocal/LocalDataSet.cpp index aeb5c6b3..260f8500 100644 --- a/src/core/datapoollocal/LocalDataSet.cpp +++ b/src/core/datapoollocal/LocalDataSet.cpp @@ -1,6 +1,7 @@ -#include "LocalDataSet.h" -#include "../datapoollocal/LocalDataPoolManager.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/datapoollocal/LocalDataSet.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" + +#include "fsfw/serialize/SerializeAdapter.h" #include #include diff --git a/src/core/datapoollocal/LocalPoolDataSetBase.cpp b/src/core/datapoollocal/LocalPoolDataSetBase.cpp index a7a7e6c8..5422c68a 100644 --- a/src/core/datapoollocal/LocalPoolDataSetBase.cpp +++ b/src/core/datapoollocal/LocalPoolDataSetBase.cpp @@ -1,13 +1,12 @@ -#include "LocalPoolDataSetBase.h" -#include "HasLocalDataPoolIF.h" +#include "fsfw/datapoollocal.h" #include "internal/HasLocalDpIFUserAttorney.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../objectmanager/ObjectManager.h" -#include "../globalfunctions/bitutility.h" -#include "../datapoollocal/LocalDataPoolManager.h" -#include "../housekeeping/PeriodicHousekeepingHelper.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/globalfunctions/bitutility.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" +#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h" +#include "fsfw/serialize/SerializeAdapter.h" #include #include diff --git a/src/core/datapoollocal/LocalPoolObjectBase.cpp b/src/core/datapoollocal/LocalPoolObjectBase.cpp index 6920749b..96b849c6 100644 --- a/src/core/datapoollocal/LocalPoolObjectBase.cpp +++ b/src/core/datapoollocal/LocalPoolObjectBase.cpp @@ -1,10 +1,10 @@ -#include "LocalPoolObjectBase.h" -#include "LocalDataPoolManager.h" -#include "AccessLocalPoolF.h" -#include "HasLocalDataPoolIF.h" +#include "fsfw/datapoollocal/LocalPoolObjectBase.h" +#include "fsfw/datapoollocal/LocalDataPoolManager.h" +#include "fsfw/datapoollocal/AccessLocalPoolF.h" +#include "fsfw/datapoollocal/HasLocalDataPoolIF.h" #include "internal/HasLocalDpIFUserAttorney.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner, diff --git a/src/core/datapoollocal/SharedLocalDataSet.cpp b/src/core/datapoollocal/SharedLocalDataSet.cpp index 84c2d1c3..2ee00aca 100644 --- a/src/core/datapoollocal/SharedLocalDataSet.cpp +++ b/src/core/datapoollocal/SharedLocalDataSet.cpp @@ -1,4 +1,4 @@ -#include "SharedLocalDataSet.h" +#include "fsfw/datapoollocal/SharedLocalDataSet.h" SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, sid_t sid, diff --git a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp index 65feda75..a275626b 100644 --- a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp +++ b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp @@ -1,7 +1,7 @@ #include "HasLocalDpIFManagerAttorney.h" -#include "../LocalPoolObjectBase.h" -#include "../LocalPoolDataSetBase.h" -#include "../HasLocalDataPoolIF.h" +#include "fsfw/datapoollocal/LocalPoolObjectBase.h" +#include "fsfw/datapoollocal/LocalPoolDataSetBase.h" +#include "fsfw/datapoollocal/HasLocalDataPoolIF.h" LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* clientIF, sid_t sid) { diff --git a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h index dfe333a6..a82ee489 100644 --- a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h +++ b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h @@ -1,7 +1,7 @@ #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_ #define FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_ -#include "../localPoolDefinitions.h" +#include "fsfw/datapoollocal/localPoolDefinitions.h" class HasLocalDataPoolIF; class LocalPoolDataSetBase; diff --git a/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp b/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp index 838204a7..8c52fbfb 100644 --- a/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp +++ b/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp @@ -1,6 +1,6 @@ #include "HasLocalDpIFUserAttorney.h" -#include "../AccessLocalPoolF.h" -#include "../HasLocalDataPoolIF.h" +#include "fsfw/datapoollocal/AccessLocalPoolF.h" +#include "fsfw/datapoollocal/HasLocalDataPoolIF.h" AccessPoolManagerIF* HasLocalDpIFUserAttorney::getAccessorHandle(HasLocalDataPoolIF *clientIF) { return clientIF->getAccessorHandle(); diff --git a/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h b/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h index f81428cd..9e46cffd 100644 --- a/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h +++ b/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h @@ -1,7 +1,7 @@ #ifndef FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_ #define FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_ -#include "../LocalPoolDataSetBase.h" +#include "fsfw/datapoollocal/LocalPoolDataSetBase.h" class LocalPoolDataSetAttorney { private: diff --git a/src/core/devicehandlers/AssemblyBase.cpp b/src/core/devicehandlers/AssemblyBase.cpp index 46b2211a..146adfcb 100644 --- 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) : diff --git a/src/core/devicehandlers/CMakeLists.txt b/src/core/devicehandlers/CMakeLists.txt new file mode 100644 index 00000000..a3fb6d65 --- /dev/null +++ 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 +) diff --git a/src/core/devicehandlers/ChildHandlerBase.cpp b/src/core/devicehandlers/ChildHandlerBase.cpp index 628ea3e0..e6508727 100644 --- 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, diff --git a/src/core/devicehandlers/ChildHandlerFDIR.cpp b/src/core/devicehandlers/ChildHandlerFDIR.cpp index cb4c75ea..e1d1321d 100644 --- 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) : diff --git a/src/core/devicehandlers/DeviceHandlerBase.cpp b/src/core/devicehandlers/DeviceHandlerBase.cpp index 5665b101..96fe031a 100644 --- 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; diff --git a/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp b/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp index b0708a59..8b1c1489 100644 --- 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; diff --git a/src/core/devicehandlers/DeviceHandlerMessage.cpp b/src/core/devicehandlers/DeviceHandlerMessage.cpp index 69c9deb9..48277c9a 100644 --- 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) { diff --git a/src/core/devicehandlers/DeviceTmReportingWrapper.cpp b/src/core/devicehandlers/DeviceTmReportingWrapper.cpp index c70f57d6..0300a24a 100644 --- 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) : diff --git a/src/core/devicehandlers/HealthDevice.cpp b/src/core/devicehandlers/HealthDevice.cpp index e23dd5b6..2f6e1dfb 100644 --- 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) : diff --git a/src/core/events/CMakeLists.txt b/src/core/events/CMakeLists.txt index 4e935167..28eec772 100644 --- a/src/core/events/CMakeLists.txt +++ b/src/core/events/CMakeLists.txt @@ -1,7 +1,6 @@ -target_sources(${LIB_FSFW_NAME} - PRIVATE - EventManager.cpp - EventMessage.cpp +target_sources(${LIB_FSFW_NAME} PRIVATE + EventManager.cpp + EventMessage.cpp ) -add_subdirectory(eventmatching) \ No newline at end of file +add_subdirectory(eventmatching) diff --git a/src/core/events/EventManager.cpp b/src/core/events/EventManager.cpp index 8e2a2a82..5aa82434 100644 --- a/src/core/events/EventManager.cpp +++ b/src/core/events/EventManager.cpp @@ -1,8 +1,8 @@ -#include "EventManager.h" -#include "EventMessage.h" +#include "fsfw/events/EventManager.h" +#include "fsfw/events/EventMessage.h" -#include "../ipc/QueueFactory.h" -#include "../ipc/MutexFactory.h" +#include "fsfw/ipc/QueueFactory.h" +#include "fsfw/ipc/MutexFactory.h" MessageQueueId_t EventManagerIF::eventmanagerQueue = MessageQueueIF::NO_QUEUE; diff --git a/src/core/events/EventMessage.cpp b/src/core/events/EventMessage.cpp index 548b4f0f..74f42b06 100644 --- a/src/core/events/EventMessage.cpp +++ b/src/core/events/EventMessage.cpp @@ -1,4 +1,4 @@ -#include "EventMessage.h" +#include "fsfw/events/EventMessage.h" #include EventMessage::EventMessage() { diff --git a/inc/fsfw/events/eventmatching/CMakeLists.txt b/src/core/events/eventmatching/CMakeLists.txt similarity index 100% rename from inc/fsfw/events/eventmatching/CMakeLists.txt rename to src/core/events/eventmatching/CMakeLists.txt diff --git a/inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp b/src/core/events/eventmatching/EventIdRangeMatcher.cpp similarity index 84% rename from inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp rename to src/core/events/eventmatching/EventIdRangeMatcher.cpp index 974567d4..92089f7c 100644 --- a/inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp +++ b/src/core/events/eventmatching/EventIdRangeMatcher.cpp @@ -1,4 +1,4 @@ -#include "EventIdRangeMatcher.h" +#include "fsfw/events/eventmatching/EventIdRangeMatcher.h" EventIdRangeMatcher::EventIdRangeMatcher(EventId_t lower, EventId_t upper, bool inverted) : EventRangeMatcherBase(lower, upper, inverted) { diff --git a/inc/fsfw/events/eventmatching/EventMatchTree.cpp b/src/core/events/eventmatching/EventMatchTree.cpp similarity index 94% rename from inc/fsfw/events/eventmatching/EventMatchTree.cpp rename to src/core/events/eventmatching/EventMatchTree.cpp index 55e4083f..66e9e91a 100644 --- a/inc/fsfw/events/eventmatching/EventMatchTree.cpp +++ b/src/core/events/eventmatching/EventMatchTree.cpp @@ -1,7 +1,7 @@ -#include "EventIdRangeMatcher.h" -#include "EventMatchTree.h" -#include "ReporterRangeMatcher.h" -#include "SeverityRangeMatcher.h" +#include "fsfw/events/eventmatching/EventIdRangeMatcher.h" +#include "fsfw/events/eventmatching/EventMatchTree.h" +#include "fsfw/events/eventmatching/ReporterRangeMatcher.h" +#include "fsfw/events/eventmatching/SeverityRangeMatcher.h" EventMatchTree::EventMatchTree(StorageManagerIF* storageBackend, bool invertedMatch) : diff --git a/inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp b/src/core/events/eventmatching/ReporterRangeMatcher.cpp similarity index 84% rename from inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp rename to src/core/events/eventmatching/ReporterRangeMatcher.cpp index 61179726..fc3a2f9f 100644 --- a/inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp +++ b/src/core/events/eventmatching/ReporterRangeMatcher.cpp @@ -1,4 +1,4 @@ -#include "ReporterRangeMatcher.h" +#include "fsfw/events/eventmatching/ReporterRangeMatcher.h" ReporterRangeMatcher::ReporterRangeMatcher(object_id_t lower, object_id_t upper, bool inverted) : EventRangeMatcherBase(lower, upper, inverted) { diff --git a/inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp b/src/core/events/eventmatching/SeverityRangeMatcher.cpp similarity index 70% rename from inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp rename to src/core/events/eventmatching/SeverityRangeMatcher.cpp index 6fd38271..230e4e77 100644 --- a/inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp +++ b/src/core/events/eventmatching/SeverityRangeMatcher.cpp @@ -1,6 +1,6 @@ -#include "SeverityRangeMatcher.h" -#include "../../events/EventMessage.h" -#include "../../serialize/SerializeAdapter.h" +#include "fsfw/events/eventmatching/SeverityRangeMatcher.h" +#include "fsfw/events/EventMessage.h" +#include "fsfw/serialize/SerializeAdapter.h" SeverityRangeMatcher::SeverityRangeMatcher(EventSeverity_t from, EventSeverity_t till, bool inverted) : EventRangeMatcherBase(from, till, inverted) { diff --git a/src/core/fdir/EventCorrelation.cpp b/src/core/fdir/EventCorrelation.cpp index d60fc6ca..5b023334 100644 --- a/src/core/fdir/EventCorrelation.cpp +++ b/src/core/fdir/EventCorrelation.cpp @@ -1,4 +1,4 @@ -#include "EventCorrelation.h" +#include "fsfw/fdir/EventCorrelation.h" EventCorrelation::EventCorrelation(uint32_t timeout) : eventPending(false) { diff --git a/src/core/fdir/FailureIsolationBase.cpp b/src/core/fdir/FailureIsolationBase.cpp index 764fc918..717e5072 100644 --- a/src/core/fdir/FailureIsolationBase.cpp +++ b/src/core/fdir/FailureIsolationBase.cpp @@ -1,9 +1,9 @@ -#include "../events/EventManagerIF.h" -#include "FailureIsolationBase.h" -#include "../health/HasHealthIF.h" -#include "../health/HealthMessage.h" -#include "../ipc/QueueFactory.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/events/EventManagerIF.h" +#include "fsfw/fdir/FailureIsolationBase.h" +#include "fsfw/health/HasHealthIF.h" +#include "fsfw/health/HealthMessage.h" +#include "fsfw/ipc/QueueFactory.h" +#include "fsfw/objectmanager/ObjectManager.h" FailureIsolationBase::FailureIsolationBase(object_id_t owner, object_id_t parent, uint8_t messageDepth, uint8_t parameterDomainBase) : diff --git a/src/core/fdir/FaultCounter.cpp b/src/core/fdir/FaultCounter.cpp index 53c1dd7d..0b30a67d 100644 --- a/src/core/fdir/FaultCounter.cpp +++ b/src/core/fdir/FaultCounter.cpp @@ -1,4 +1,4 @@ -#include "FaultCounter.h" +#include "fsfw/fdir/FaultCounter.h" FaultCounter::FaultCounter(uint32_t failureThreshold, uint32_t decrementAfterMs, uint8_t setParameterDomain) : diff --git a/src/core/globalfunctions/AsciiConverter.cpp b/src/core/globalfunctions/AsciiConverter.cpp index 9eb3698f..09908815 100644 --- a/src/core/globalfunctions/AsciiConverter.cpp +++ b/src/core/globalfunctions/AsciiConverter.cpp @@ -1,4 +1,5 @@ -#include "AsciiConverter.h" +#include "fsfw/globalfunctions/AsciiConverter.h" + #include #include diff --git a/src/core/globalfunctions/CRC.cpp b/src/core/globalfunctions/CRC.cpp index 7bb56806..3df6018c 100644 --- a/src/core/globalfunctions/CRC.cpp +++ b/src/core/globalfunctions/CRC.cpp @@ -1,4 +1,4 @@ -#include "CRC.h" +#include "fsfw/globalfunctions/CRC.h" #include const uint16_t CRC::crc16ccitt_table[256] = { diff --git a/src/core/globalfunctions/DleEncoder.cpp b/src/core/globalfunctions/DleEncoder.cpp index 8520389d..11df8ad7 100644 --- a/src/core/globalfunctions/DleEncoder.cpp +++ b/src/core/globalfunctions/DleEncoder.cpp @@ -1,4 +1,4 @@ -#include "../globalfunctions/DleEncoder.h" +#include "fsfw/globalfunctions/DleEncoder.h" DleEncoder::DleEncoder() {} diff --git a/src/core/globalfunctions/PeriodicOperationDivider.cpp b/src/core/globalfunctions/PeriodicOperationDivider.cpp index 28e98feb..62cc6f4c 100644 --- a/src/core/globalfunctions/PeriodicOperationDivider.cpp +++ b/src/core/globalfunctions/PeriodicOperationDivider.cpp @@ -1,4 +1,4 @@ -#include "PeriodicOperationDivider.h" +#include "fsfw/globalfunctions/PeriodicOperationDivider.h" PeriodicOperationDivider::PeriodicOperationDivider(uint32_t divider, diff --git a/src/core/globalfunctions/Type.cpp b/src/core/globalfunctions/Type.cpp index fa6d2f28..5f1e05d1 100644 --- a/src/core/globalfunctions/Type.cpp +++ b/src/core/globalfunctions/Type.cpp @@ -1,5 +1,5 @@ -#include "Type.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/globalfunctions/Type.h" +#include "fsfw/serialize/SerializeAdapter.h" Type::Type() : actualType(UNKNOWN_TYPE) { diff --git a/src/core/globalfunctions/arrayprinter.cpp b/src/core/globalfunctions/arrayprinter.cpp index 3c729c6b..45a1cb38 100644 --- a/src/core/globalfunctions/arrayprinter.cpp +++ b/src/core/globalfunctions/arrayprinter.cpp @@ -1,5 +1,6 @@ -#include "arrayprinter.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/globalfunctions/arrayprinter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" + #include diff --git a/src/core/globalfunctions/bitutility.cpp b/src/core/globalfunctions/bitutility.cpp index 5cc92dac..628e30c2 100644 --- a/src/core/globalfunctions/bitutility.cpp +++ b/src/core/globalfunctions/bitutility.cpp @@ -1,4 +1,4 @@ -#include "bitutility.h" +#include "fsfw/globalfunctions/bitutility.h" void bitutil::bitSet(uint8_t *byte, uint8_t position) { if(position > 7) { diff --git a/src/core/globalfunctions/math/QuaternionOperations.cpp b/src/core/globalfunctions/math/QuaternionOperations.cpp index c09426da..31ba2044 100644 --- a/src/core/globalfunctions/math/QuaternionOperations.cpp +++ b/src/core/globalfunctions/math/QuaternionOperations.cpp @@ -1,5 +1,5 @@ -#include "QuaternionOperations.h" -#include "VectorOperations.h" +#include "fsfw/globalfunctions/math/QuaternionOperations.h" +#include "fsfw/globalfunctions/math/VectorOperations.h" #include #include diff --git a/src/core/globalfunctions/timevalOperations.cpp b/src/core/globalfunctions/timevalOperations.cpp index 1228da04..e91e7f57 100644 --- a/src/core/globalfunctions/timevalOperations.cpp +++ b/src/core/globalfunctions/timevalOperations.cpp @@ -1,4 +1,4 @@ -#include "timevalOperations.h" +#include "fsfw/globalfunctions/timevalOperations.h" timeval& operator+=(timeval& lhs, const timeval& rhs) { int64_t sum = lhs.tv_sec * 1000000. + lhs.tv_usec; diff --git a/src/core/health/HealthHelper.cpp b/src/core/health/HealthHelper.cpp index 28419108..6bbbe25b 100644 --- a/src/core/health/HealthHelper.cpp +++ b/src/core/health/HealthHelper.cpp @@ -1,5 +1,6 @@ -#include "HealthHelper.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/health/HealthHelper.h" + +#include "fsfw/serviceinterface/ServiceInterface.h" HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) : objectId(objectId), owner(owner) { diff --git a/src/core/health/HealthMessage.cpp b/src/core/health/HealthMessage.cpp index 52479c26..31b6273b 100644 --- a/src/core/health/HealthMessage.cpp +++ b/src/core/health/HealthMessage.cpp @@ -1,4 +1,4 @@ -#include "HealthMessage.h" +#include "fsfw/health/HealthMessage.h" void HealthMessage::setHealthMessage(CommandMessage* message, Command_t command, HasHealthIF::HealthState health, HasHealthIF::HealthState oldHealth) { diff --git a/src/core/health/HealthTable.cpp b/src/core/health/HealthTable.cpp index 3fed1deb..a3300462 100644 --- a/src/core/health/HealthTable.cpp +++ b/src/core/health/HealthTable.cpp @@ -1,7 +1,8 @@ -#include "HealthTable.h" -#include "../ipc/MutexGuard.h" -#include "../ipc/MutexFactory.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/health/HealthTable.h" + +#include "fsfw/ipc/MutexGuard.h" +#include "fsfw/ipc/MutexFactory.h" +#include "fsfw/serialize/SerializeAdapter.h" HealthTable::HealthTable(object_id_t objectid) : SystemObject(objectid) { diff --git a/src/core/housekeeping/CMakeLists.txt b/src/core/housekeeping/CMakeLists.txt new file mode 100644 index 00000000..0a3e7bd1 --- /dev/null +++ b/src/core/housekeeping/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(${LIB_FSFW_NAME} PRIVATE + HousekeepingMessage.cpp + PeriodicHousekeepingHelper.cpp +) \ No newline at end of file diff --git a/src/core/housekeeping/HousekeepingMessage.cpp b/src/core/housekeeping/HousekeepingMessage.cpp index 71f7ff17..432a8620 100644 --- a/src/core/housekeeping/HousekeepingMessage.cpp +++ b/src/core/housekeeping/HousekeepingMessage.cpp @@ -1,6 +1,7 @@ -#include "HousekeepingMessage.h" +#include "fsfw/housekeeping/HousekeepingMessage.h" + +#include "fsfw/objectmanager/ObjectManager.h" -#include "../objectmanager/ObjectManager.h" #include HousekeepingMessage::~HousekeepingMessage() {} diff --git a/src/core/housekeeping/PeriodicHousekeepingHelper.cpp b/src/core/housekeeping/PeriodicHousekeepingHelper.cpp index 892eb354..68740d33 100644 --- a/src/core/housekeeping/PeriodicHousekeepingHelper.cpp +++ b/src/core/housekeeping/PeriodicHousekeepingHelper.cpp @@ -1,6 +1,6 @@ -#include "PeriodicHousekeepingHelper.h" +#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h" -#include "../datapoollocal/LocalPoolDataSetBase.h" +#include "fsfw/datapoollocal/LocalPoolDataSetBase.h" #include PeriodicHousekeepingHelper::PeriodicHousekeepingHelper( diff --git a/src/core/internalError/CMakeLists.txt b/src/core/internalerror/CMakeLists.txt similarity index 100% rename from src/core/internalError/CMakeLists.txt rename to src/core/internalerror/CMakeLists.txt diff --git a/src/core/internalError/InternalErrorReporter.cpp b/src/core/internalerror/InternalErrorReporter.cpp similarity index 96% rename from src/core/internalError/InternalErrorReporter.cpp rename to src/core/internalerror/InternalErrorReporter.cpp index 78618448..8689ab3e 100644 --- a/src/core/internalError/InternalErrorReporter.cpp +++ b/src/core/internalerror/InternalErrorReporter.cpp @@ -1,9 +1,9 @@ -#include "InternalErrorReporter.h" +#include "fsfw/internalerror/InternalErrorReporter.h" -#include "../ipc/QueueFactory.h" -#include "../ipc/MutexFactory.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../datapool/PoolReadGuard.h" +#include "fsfw/ipc/QueueFactory.h" +#include "fsfw/ipc/MutexFactory.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/datapool/PoolReadGuard.h" InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth): SystemObject(setObjectId), diff --git a/src/core/ipc/CommandMessage.cpp b/src/core/ipc/CommandMessage.cpp index 513debd3..9448d152 100644 --- a/src/core/ipc/CommandMessage.cpp +++ b/src/core/ipc/CommandMessage.cpp @@ -1,5 +1,6 @@ -#include "CommandMessage.h" -#include "CommandMessageCleaner.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/ipc/CommandMessageCleaner.h" + #include CommandMessage::CommandMessage() { diff --git a/src/core/ipc/CommandMessageCleaner.cpp b/src/core/ipc/CommandMessageCleaner.cpp index 29998124..ca835509 100644 --- a/src/core/ipc/CommandMessageCleaner.cpp +++ b/src/core/ipc/CommandMessageCleaner.cpp @@ -1,15 +1,15 @@ -#include "CommandMessageCleaner.h" +#include "fsfw/ipc/CommandMessageCleaner.h" -#include "../memory/GenericFileSystemMessage.h" -#include "../devicehandlers/DeviceHandlerMessage.h" -#include "../health/HealthMessage.h" -#include "../memory/MemoryMessage.h" -#include "../modes/ModeMessage.h" -#include "../monitoring/MonitoringMessage.h" -#include "../subsystem/modes/ModeSequenceMessage.h" -#include "../tmstorage/TmStoreMessage.h" -#include "../housekeeping/HousekeepingMessage.h" -#include "../parameters/ParameterMessage.h" +#include "fsfw/memory/GenericFileSystemMessage.h" +#include "fsfw/devicehandlers/DeviceHandlerMessage.h" +#include "fsfw/health/HealthMessage.h" +#include "fsfw/memory/MemoryMessage.h" +#include "fsfw/modes/ModeMessage.h" +#include "fsfw/monitoring/MonitoringMessage.h" +#include "fsfw/subsystem/modes/ModeSequenceMessage.h" +#include "fsfw/tmstorage/TmStoreMessage.h" +#include "fsfw/housekeeping/HousekeepingMessage.h" +#include "fsfw/parameters/ParameterMessage.h" void CommandMessageCleaner::clearCommandMessage(CommandMessage* message) { switch(message->getMessageType()){ diff --git a/src/core/ipc/MessageQueueMessage.cpp b/src/core/ipc/MessageQueueMessage.cpp index 1958af54..62b826e9 100644 --- a/src/core/ipc/MessageQueueMessage.cpp +++ b/src/core/ipc/MessageQueueMessage.cpp @@ -1,6 +1,7 @@ -#include "MessageQueueMessage.h" -#include "../serviceinterface/ServiceInterfaceStream.h" -#include "../globalfunctions/arrayprinter.h" +#include "fsfw/ipc/MessageQueueMessage.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/globalfunctions/arrayprinter.h" + #include MessageQueueMessage::MessageQueueMessage() : diff --git a/src/core/memory/GenericFileSystemMessage.cpp b/src/core/memory/GenericFileSystemMessage.cpp index b0e1a9ec..abf04c4e 100644 --- a/src/core/memory/GenericFileSystemMessage.cpp +++ b/src/core/memory/GenericFileSystemMessage.cpp @@ -1,7 +1,7 @@ -#include "GenericFileSystemMessage.h" +#include "fsfw/memory/GenericFileSystemMessage.h" -#include "../objectmanager/ObjectManager.h" -#include "../storagemanager/StorageManagerIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/storagemanager/StorageManagerIF.h" void GenericFileSystemMessage::setCreateFileCommand(CommandMessage* message, store_address_t storeId) { diff --git a/src/core/memory/MemoryHelper.cpp b/src/core/memory/MemoryHelper.cpp index d83a9fab..2039a488 100644 --- a/src/core/memory/MemoryHelper.cpp +++ b/src/core/memory/MemoryHelper.cpp @@ -1,10 +1,10 @@ -#include "MemoryHelper.h" -#include "MemoryMessage.h" +#include "fsfw/memory/MemoryHelper.h" +#include "fsfw/memory/MemoryMessage.h" -#include "../globalfunctions/CRC.h" -#include "../objectmanager/ObjectManager.h" -#include "../serialize/EndianConverter.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/globalfunctions/CRC.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serialize/EndianConverter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" MemoryHelper::MemoryHelper(HasMemoryIF* workOnThis, MessageQueueIF* useThisQueue): diff --git a/src/core/memory/MemoryMessage.cpp b/src/core/memory/MemoryMessage.cpp index 1f050ef8..9df52609 100644 --- a/src/core/memory/MemoryMessage.cpp +++ b/src/core/memory/MemoryMessage.cpp @@ -1,6 +1,6 @@ -#include "MemoryMessage.h" +#include "fsfw/memory/MemoryMessage.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" uint32_t MemoryMessage::getAddress(const CommandMessage* message) { return message->getParameter(); diff --git a/src/core/modes/ModeHelper.cpp b/src/core/modes/ModeHelper.cpp index 6be4f776..d2c5067d 100644 --- a/src/core/modes/ModeHelper.cpp +++ b/src/core/modes/ModeHelper.cpp @@ -1,8 +1,8 @@ -#include "HasModesIF.h" -#include "ModeHelper.h" +#include "fsfw/modes/HasModesIF.h" +#include "fsfw/modes/ModeHelper.h" -#include "../ipc/MessageQueueSenderIF.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/ipc/MessageQueueSenderIF.h" +#include "fsfw/serviceinterface/ServiceInterface.h" ModeHelper::ModeHelper(HasModesIF *owner) : commandedMode(HasModesIF::MODE_OFF), diff --git a/src/core/modes/ModeMessage.cpp b/src/core/modes/ModeMessage.cpp index b33bba60..a228304d 100644 --- a/src/core/modes/ModeMessage.cpp +++ b/src/core/modes/ModeMessage.cpp @@ -1,4 +1,4 @@ -#include "ModeMessage.h" +#include "fsfw/modes/ModeMessage.h" Mode_t ModeMessage::getMode(const CommandMessage* message) { return message->getParameter(); diff --git a/src/core/objectmanager/ObjectManager.cpp b/src/core/objectmanager/ObjectManager.cpp index 3e6820a7..639688ab 100644 --- a/src/core/objectmanager/ObjectManager.cpp +++ b/src/core/objectmanager/ObjectManager.cpp @@ -1,5 +1,5 @@ -#include "ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #if FSFW_CPP_OSTREAM_ENABLED == 1 #include diff --git a/src/core/objectmanager/SystemObject.cpp b/src/core/objectmanager/SystemObject.cpp index 123bbe65..bad38975 100644 --- a/src/core/objectmanager/SystemObject.cpp +++ b/src/core/objectmanager/SystemObject.cpp @@ -1,6 +1,6 @@ -#include "ObjectManager.h" -#include "SystemObject.h" -#include "../events/EventManagerIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/SystemObject.h" +#include "fsfw/events/EventManagerIF.h" SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) : objectId(setObjectId), registered(doRegister) { diff --git a/src/core/parameters/ParameterHelper.cpp b/src/core/parameters/ParameterHelper.cpp index 694ec5a4..9250a1d4 100644 --- a/src/core/parameters/ParameterHelper.cpp +++ b/src/core/parameters/ParameterHelper.cpp @@ -1,7 +1,7 @@ -#include "ParameterHelper.h" -#include "ParameterMessage.h" +#include "fsfw/parameters/ParameterHelper.h" +#include "fsfw/parameters/ParameterMessage.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" ParameterHelper::ParameterHelper(ReceivesParameterMessagesIF* owner): owner(owner) {} diff --git a/src/core/parameters/ParameterMessage.cpp b/src/core/parameters/ParameterMessage.cpp index 8a5835ff..ee58339c 100644 --- a/src/core/parameters/ParameterMessage.cpp +++ b/src/core/parameters/ParameterMessage.cpp @@ -1,6 +1,6 @@ -#include "ParameterMessage.h" +#include "fsfw/parameters/ParameterMessage.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" ParameterId_t ParameterMessage::getParameterId(const CommandMessage* message) { return message->getParameter(); diff --git a/src/core/parameters/ParameterWrapper.cpp b/src/core/parameters/ParameterWrapper.cpp index 660d7db7..8c09a822 100644 --- a/src/core/parameters/ParameterWrapper.cpp +++ b/src/core/parameters/ParameterWrapper.cpp @@ -1,6 +1,6 @@ -#include "ParameterWrapper.h" -#include -#include +#include "fsfw/FSFW.h" +#include "fsfw/parameters/ParameterWrapper.h" +#include "fsfw/serviceinterface/ServiceInterface.h" ParameterWrapper::ParameterWrapper() : pointsToStream(false), type(Type::UNKNOWN_TYPE) { diff --git a/src/core/power/Fuse.cpp b/src/core/power/Fuse.cpp index 0cb1385b..821bdbc5 100644 --- a/src/core/power/Fuse.cpp +++ b/src/core/power/Fuse.cpp @@ -1,10 +1,10 @@ -#include "Fuse.h" +#include "fsfw/power/Fuse.h" -#include "../monitoring/LimitViolationReporter.h" -#include "../monitoring/MonitoringMessageContent.h" -#include "../objectmanager/ObjectManager.h" -#include "../serialize/SerialFixedArrayListAdapter.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/monitoring/LimitViolationReporter.h" +#include "fsfw/monitoring/MonitoringMessageContent.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serialize/SerialFixedArrayListAdapter.h" +#include "fsfw/ipc/QueueFactory.h" object_id_t Fuse::powerSwitchId = 0; diff --git a/src/core/power/PowerComponent.cpp b/src/core/power/PowerComponent.cpp index 9ea84dad..fb66748a 100644 --- a/src/core/power/PowerComponent.cpp +++ b/src/core/power/PowerComponent.cpp @@ -1,5 +1,5 @@ -#include "PowerComponent.h" -#include "../serialize/SerializeAdapter.h" +#include "fsfw/power/PowerComponent.h" +#include "fsfw/serialize/SerializeAdapter.h" PowerComponent::PowerComponent(): switchId1(0xFF), switchId2(0xFF), diff --git a/src/core/power/PowerSensor.cpp b/src/core/power/PowerSensor.cpp index 40d7afc6..e1e31353 100644 --- a/src/core/power/PowerSensor.cpp +++ b/src/core/power/PowerSensor.cpp @@ -1,6 +1,6 @@ -#include "PowerSensor.h" +#include "fsfw/power/PowerSensor.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/ipc/QueueFactory.h" PowerSensor::PowerSensor(object_id_t objectId, sid_t setId, VariableIds ids, DefaultLimits limits, SensorEvents events, uint16_t confirmationCount) : diff --git a/src/core/power/PowerSwitcher.cpp b/src/core/power/PowerSwitcher.cpp index 642a2697..f849a7fb 100644 --- a/src/core/power/PowerSwitcher.cpp +++ b/src/core/power/PowerSwitcher.cpp @@ -1,7 +1,7 @@ -#include "PowerSwitcher.h" +#include "fsfw/power/PowerSwitcher.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" PowerSwitcher::PowerSwitcher(uint8_t setSwitch1, uint8_t setSwitch2, PowerSwitcher::State_t setStartState): diff --git a/src/core/serialize/SerialBufferAdapter.cpp b/src/core/serialize/SerialBufferAdapter.cpp index 53b8c3d5..4f03658a 100644 --- a/src/core/serialize/SerialBufferAdapter.cpp +++ b/src/core/serialize/SerialBufferAdapter.cpp @@ -1,5 +1,5 @@ -#include "../serialize/SerialBufferAdapter.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/serialize/SerialBufferAdapter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include template diff --git a/src/core/serviceinterface/ServiceInterfaceBuffer.cpp b/src/core/serviceinterface/ServiceInterfaceBuffer.cpp index b85a43a4..7cba2145 100644 --- a/src/core/serviceinterface/ServiceInterfaceBuffer.cpp +++ b/src/core/serviceinterface/ServiceInterfaceBuffer.cpp @@ -1,10 +1,10 @@ -#include "ServiceInterfaceBuffer.h" +#include "fsfw/serviceinterface/ServiceInterfaceBuffer.h" #if FSFW_CPP_OSTREAM_ENABLED == 1 -#include "../timemanager/Clock.h" +#include "fsfw/timemanager/Clock.h" -#include "serviceInterfaceDefintions.h" +#include "fsfw/serviceinterface/serviceInterfaceDefintions.h" #include #include diff --git a/src/core/serviceinterface/ServiceInterfacePrinter.cpp b/src/core/serviceinterface/ServiceInterfacePrinter.cpp index ce797f1c..9b62e91d 100644 --- a/src/core/serviceinterface/ServiceInterfacePrinter.cpp +++ b/src/core/serviceinterface/ServiceInterfacePrinter.cpp @@ -1,7 +1,7 @@ -#include -#include "ServiceInterfacePrinter.h" -#include "serviceInterfaceDefintions.h" -#include "../timemanager/Clock.h" +#include "fsfw/FSFW.h" +#include "fsfw/serviceinterface/ServiceInterfacePrinter.h" +#include "fsfw/serviceinterface/serviceInterfaceDefintions.h" +#include "fsfw/timemanager/Clock.h" #include #include diff --git a/src/core/serviceinterface/ServiceInterfaceStream.cpp b/src/core/serviceinterface/ServiceInterfaceStream.cpp index 80942b88..fe45442d 100644 --- a/src/core/serviceinterface/ServiceInterfaceStream.cpp +++ b/src/core/serviceinterface/ServiceInterfaceStream.cpp @@ -1,4 +1,4 @@ -#include "ServiceInterfaceStream.h" +#include "fsfw/serviceinterface/ServiceInterfaceStream.h" #if FSFW_CPP_OSTREAM_ENABLED == 1 diff --git a/src/core/storagemanager/ConstStorageAccessor.cpp b/src/core/storagemanager/ConstStorageAccessor.cpp index aab84862..67736d51 100644 --- a/src/core/storagemanager/ConstStorageAccessor.cpp +++ b/src/core/storagemanager/ConstStorageAccessor.cpp @@ -1,8 +1,8 @@ -#include "ConstStorageAccessor.h" -#include "StorageManagerIF.h" +#include "fsfw/storagemanager/ConstStorageAccessor.h" +#include "fsfw/storagemanager/StorageManagerIF.h" -#include "../serviceinterface/ServiceInterfaceStream.h" -#include "../globalfunctions/arrayprinter.h" +#include "fsfw/serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/globalfunctions/arrayprinter.h" #include diff --git a/src/core/storagemanager/LocalPool.cpp b/src/core/storagemanager/LocalPool.cpp index 41c9250a..c5e74e08 100644 --- a/src/core/storagemanager/LocalPool.cpp +++ b/src/core/storagemanager/LocalPool.cpp @@ -1,7 +1,7 @@ -#include "LocalPool.h" -#include "FSFWConfig.h" +#include "fsfw/FSFW.h" +#include "fsfw/storagemanager/LocalPool.h" -#include "../objectmanager/ObjectManager.h" +#include "fsfw/objectmanager/ObjectManager.h" #include diff --git a/src/core/storagemanager/PoolManager.cpp b/src/core/storagemanager/PoolManager.cpp index eec84907..073371ad 100644 --- a/src/core/storagemanager/PoolManager.cpp +++ b/src/core/storagemanager/PoolManager.cpp @@ -1,5 +1,6 @@ -#include "PoolManager.h" -#include +#include "fsfw/FSFW.h" +#include "fsfw/storagemanager/PoolManager.h" + PoolManager::PoolManager(object_id_t setObjectId, const LocalPoolConfig& localPoolConfig): diff --git a/src/core/storagemanager/StorageAccessor.cpp b/src/core/storagemanager/StorageAccessor.cpp index a7b4fae4..95f61a75 100644 --- a/src/core/storagemanager/StorageAccessor.cpp +++ b/src/core/storagemanager/StorageAccessor.cpp @@ -1,6 +1,7 @@ -#include "StorageAccessor.h" -#include "StorageManagerIF.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/storagemanager/StorageAccessor.h" +#include "fsfw/storagemanager/StorageManagerIF.h" + +#include "fsfw/serviceinterface/ServiceInterface.h" #include diff --git a/src/core/subsystem/Subsystem.cpp b/src/core/subsystem/Subsystem.cpp index dffad034..0c8e3f35 100644 --- a/src/core/subsystem/Subsystem.cpp +++ b/src/core/subsystem/Subsystem.cpp @@ -1,11 +1,11 @@ -#include "Subsystem.h" +#include "fsfw/subsystem/Subsystem.h" -#include "../health/HealthMessage.h" -#include "../objectmanager/ObjectManager.h" -#include "../serialize/SerialArrayListAdapter.h" -#include "../serialize/SerialFixedArrayListAdapter.h" -#include "../serialize/SerializeElement.h" -#include "../serialize/SerialLinkedListAdapter.h" +#include "fsfw/health/HealthMessage.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serialize/SerialArrayListAdapter.h" +#include "fsfw/serialize/SerialFixedArrayListAdapter.h" +#include "fsfw/serialize/SerializeElement.h" +#include "fsfw/serialize/SerialLinkedListAdapter.h" #include diff --git a/src/core/subsystem/SubsystemBase.cpp b/src/core/subsystem/SubsystemBase.cpp index 0d459324..afcd43ad 100644 --- a/src/core/subsystem/SubsystemBase.cpp +++ b/src/core/subsystem/SubsystemBase.cpp @@ -1,8 +1,8 @@ -#include "SubsystemBase.h" +#include "fsfw/subsystem/SubsystemBase.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../objectmanager/ObjectManager.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/ipc/QueueFactory.h" SubsystemBase::SubsystemBase(object_id_t setObjectId, object_id_t parent, Mode_t initialMode, uint16_t commandQueueDepth) : diff --git a/src/core/subsystem/modes/ModeSequenceMessage.cpp b/src/core/subsystem/modes/ModeSequenceMessage.cpp index 749a90bf..d7570276 100644 --- a/src/core/subsystem/modes/ModeSequenceMessage.cpp +++ b/src/core/subsystem/modes/ModeSequenceMessage.cpp @@ -1,7 +1,7 @@ -#include "ModeSequenceMessage.h" +#include "fsfw/subsystem/modes/ModeSequenceMessage.h" -#include "../../objectmanager/ObjectManager.h" -#include "../../storagemanager/StorageManagerIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/storagemanager/StorageManagerIF.h" void ModeSequenceMessage::setModeSequenceMessage(CommandMessage* message, Command_t command, Mode_t sequence, store_address_t storeAddress) { diff --git a/src/core/subsystem/modes/ModeStore.cpp b/src/core/subsystem/modes/ModeStore.cpp index e216a167..e28bbc4f 100644 --- a/src/core/subsystem/modes/ModeStore.cpp +++ b/src/core/subsystem/modes/ModeStore.cpp @@ -1,4 +1,4 @@ -#include "ModeStore.h" +#include "fsfw/subsystem/modes/ModeStore.h" // todo: I think some parts are deprecated. If this is used, the define // USE_MODESTORE could be part of the new FSFWConfig.h file. diff --git a/src/core/tasks/FixedSequenceSlot.cpp b/src/core/tasks/FixedSequenceSlot.cpp index f5d82178..9f617b58 100644 --- a/src/core/tasks/FixedSequenceSlot.cpp +++ b/src/core/tasks/FixedSequenceSlot.cpp @@ -1,5 +1,6 @@ -#include "FixedSequenceSlot.h" -#include "PeriodicTaskIF.h" +#include "fsfw/tasks/FixedSequenceSlot.h" +#include "fsfw/tasks/PeriodicTaskIF.h" + #include FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime, diff --git a/src/core/tasks/FixedSlotSequence.cpp b/src/core/tasks/FixedSlotSequence.cpp index 54b6ae6d..2e5384b7 100644 --- a/src/core/tasks/FixedSlotSequence.cpp +++ b/src/core/tasks/FixedSlotSequence.cpp @@ -1,5 +1,5 @@ -#include "FixedSlotSequence.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/tasks/FixedSlotSequence.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : diff --git a/src/core/tcdistribution/CCSDSDistributor.cpp b/src/core/tcdistribution/CCSDSDistributor.cpp index 7380866a..ffceaecc 100644 --- a/src/core/tcdistribution/CCSDSDistributor.cpp +++ b/src/core/tcdistribution/CCSDSDistributor.cpp @@ -1,8 +1,8 @@ -#include "CCSDSDistributor.h" +#include "fsfw/tcdistribution/CCSDSDistributor.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../tmtcpacket/SpacePacketBase.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tmtcpacket/SpacePacketBase.h" #define CCSDS_DISTRIBUTOR_DEBUGGING 0 diff --git a/src/core/tcdistribution/PUSDistributor.cpp b/src/core/tcdistribution/PUSDistributor.cpp index 955a8093..eec02429 100644 --- a/src/core/tcdistribution/PUSDistributor.cpp +++ b/src/core/tcdistribution/PUSDistributor.cpp @@ -1,9 +1,9 @@ -#include "CCSDSDistributorIF.h" -#include "PUSDistributor.h" +#include "fsfw/tcdistribution/CCSDSDistributorIF.h" +#include "fsfw/tcdistribution/PUSDistributor.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../tmtcservices/PusVerificationReport.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tmtcservices/PusVerificationReport.h" #define PUS_DISTRIBUTOR_DEBUGGING 0 diff --git a/src/core/tcdistribution/TcDistributor.cpp b/src/core/tcdistribution/TcDistributor.cpp index df069556..8384e6ee 100644 --- a/src/core/tcdistribution/TcDistributor.cpp +++ b/src/core/tcdistribution/TcDistributor.cpp @@ -1,8 +1,8 @@ -#include "TcDistributor.h" +#include "fsfw/tcdistribution/TcDistributor.h" -#include "../serviceinterface/ServiceInterfaceStream.h" -#include "../tmtcservices/TmTcMessage.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tmtcservices/TmTcMessage.h" +#include "fsfw/ipc/QueueFactory.h" TcDistributor::TcDistributor(object_id_t objectId) : SystemObject(objectId) { diff --git a/src/core/tcdistribution/TcPacketCheck.cpp b/src/core/tcdistribution/TcPacketCheck.cpp index b3a025a4..44501c58 100644 --- a/src/core/tcdistribution/TcPacketCheck.cpp +++ b/src/core/tcdistribution/TcPacketCheck.cpp @@ -1,11 +1,11 @@ -#include "TcPacketCheck.h" +#include "fsfw/tcdistribution/TcPacketCheck.h" -#include "../globalfunctions/CRC.h" -#include "../tmtcpacket/pus/tc/TcPacketBase.h" -#include "../tmtcpacket/pus/tc/TcPacketStoredBase.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../tmtcservices/VerificationCodes.h" +#include "fsfw/globalfunctions/CRC.h" +#include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h" +#include "fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/tmtcservices/VerificationCodes.h" TcPacketCheck::TcPacketCheck(uint16_t setApid): apid(setApid) { } diff --git a/src/core/thermal/AbstractTemperatureSensor.cpp b/src/core/thermal/AbstractTemperatureSensor.cpp index 40b305af..68e8d1c0 100644 --- a/src/core/thermal/AbstractTemperatureSensor.cpp +++ b/src/core/thermal/AbstractTemperatureSensor.cpp @@ -1,5 +1,5 @@ -#include "AbstractTemperatureSensor.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/thermal/AbstractTemperatureSensor.h" +#include "fsfw/ipc/QueueFactory.h" AbstractTemperatureSensor::AbstractTemperatureSensor(object_id_t setObjectid, ThermalModuleIF *thermalModule) : diff --git a/src/core/thermal/Heater.cpp b/src/core/thermal/Heater.cpp index f97cb543..e6acba13 100644 --- a/src/core/thermal/Heater.cpp +++ b/src/core/thermal/Heater.cpp @@ -1,9 +1,9 @@ -#include "Heater.h" +#include "fsfw/thermal/Heater.h" -#include "../objectmanager/ObjectManager.h" -#include "../devicehandlers/DeviceHandlerFailureIsolation.h" -#include "../power/Fuse.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h" +#include "fsfw/power/Fuse.h" +#include "fsfw/ipc/QueueFactory.h" Heater::Heater(uint32_t objectId, uint8_t switch0, uint8_t switch1) : HealthDevice(objectId, 0), internalState(STATE_OFF), switch0(switch0), switch1(switch1), diff --git a/src/core/thermal/RedundantHeater.cpp b/src/core/thermal/RedundantHeater.cpp index 6463fcc8..e7b774cb 100644 --- a/src/core/thermal/RedundantHeater.cpp +++ b/src/core/thermal/RedundantHeater.cpp @@ -1,4 +1,4 @@ -#include "RedundantHeater.h" +#include "fsfw/thermal/RedundantHeater.h" RedundantHeater::~RedundantHeater() { } diff --git a/src/core/thermal/ThermalComponent.cpp b/src/core/thermal/ThermalComponent.cpp index d42c34b3..8d4b7bbd 100644 --- a/src/core/thermal/ThermalComponent.cpp +++ b/src/core/thermal/ThermalComponent.cpp @@ -1,4 +1,4 @@ -#include "ThermalComponent.h" +#include "fsfw/thermal/ThermalComponent.h" ThermalComponent::ThermalComponent(object_id_t reportingObjectId, uint8_t domainId, gp_id_t temperaturePoolId, diff --git a/src/core/thermal/ThermalModule.cpp b/src/core/thermal/ThermalModule.cpp index de347542..d8108ab3 100644 --- a/src/core/thermal/ThermalModule.cpp +++ b/src/core/thermal/ThermalModule.cpp @@ -1,8 +1,8 @@ -#include "ThermalModule.h" -#include "AbstractTemperatureSensor.h" +#include "fsfw/thermal/ThermalModule.h" +#include "fsfw/thermal/AbstractTemperatureSensor.h" -#include "../monitoring/LimitViolationReporter.h" -#include "../monitoring/MonitoringMessageContent.h" +#include "fsfw/monitoring/LimitViolationReporter.h" +#include "fsfw/monitoring/MonitoringMessageContent.h" ThermalModule::ThermalModule(gp_id_t moduleTemperaturePoolId, diff --git a/src/core/timemanager/CCSDSTime.cpp b/src/core/timemanager/CCSDSTime.cpp index 192c1f57..2475a5eb 100644 --- a/src/core/timemanager/CCSDSTime.cpp +++ b/src/core/timemanager/CCSDSTime.cpp @@ -1,5 +1,6 @@ -#include "CCSDSTime.h" -#include +#include "fsfw/FSFW.h" +#include "fsfw/timemanager/CCSDSTime.h" + #include #include #include diff --git a/src/core/timemanager/ClockCommon.cpp b/src/core/timemanager/ClockCommon.cpp index e56d4953..82c65b96 100644 --- a/src/core/timemanager/ClockCommon.cpp +++ b/src/core/timemanager/ClockCommon.cpp @@ -1,5 +1,5 @@ -#include "Clock.h" -#include "../ipc/MutexGuard.h" +#include "fsfw/timemanager/Clock.h" +#include "fsfw/ipc/MutexGuard.h" ReturnValue_t Clock::convertUTCToTT(timeval utc, timeval *tt) { uint16_t leapSeconds; diff --git a/src/core/timemanager/Countdown.cpp b/src/core/timemanager/Countdown.cpp index 20b56189..c3499685 100644 --- a/src/core/timemanager/Countdown.cpp +++ b/src/core/timemanager/Countdown.cpp @@ -1,4 +1,4 @@ -#include "Countdown.h" +#include "fsfw/timemanager/Countdown.h" Countdown::Countdown(uint32_t initialTimeout): timeout(initialTimeout) { } diff --git a/src/core/timemanager/Stopwatch.cpp b/src/core/timemanager/Stopwatch.cpp index 04ccab72..a8f87029 100644 --- a/src/core/timemanager/Stopwatch.cpp +++ b/src/core/timemanager/Stopwatch.cpp @@ -1,5 +1,5 @@ -#include "Stopwatch.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/timemanager/Stopwatch.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #if FSFW_CPP_OSTREAM_ENABLED == 1 #include diff --git a/src/core/tmtcpacket/SpacePacket.cpp b/src/core/tmtcpacket/SpacePacket.cpp index b8ba27e9..cbf82e0d 100644 --- a/src/core/tmtcpacket/SpacePacket.cpp +++ b/src/core/tmtcpacket/SpacePacket.cpp @@ -1,10 +1,10 @@ -#include "../serviceinterface/ServiceInterfaceStream.h" -#include "ccsds_header.h" -#include "SpacePacket.h" -#include +#include "fsfw/tmtcpacket/ccsds_header.h" +#include "fsfw/tmtcpacket/SpacePacket.h" +#include -SpacePacket::SpacePacket( uint16_t packetDataLength, bool isTelecommand, uint16_t apid, uint16_t sequenceCount ): -SpacePacketBase( (uint8_t*)&this->localData ) { +SpacePacket::SpacePacket(uint16_t packetDataLength, bool isTelecommand, uint16_t apid, + uint16_t sequenceCount): + SpacePacketBase( (uint8_t*)&this->localData ) { initSpacePacketHeader(isTelecommand, false, apid, sequenceCount); this->setPacketSequenceCount(sequenceCount); if ( packetDataLength <= sizeof(this->localData.fields.buffer) ) { diff --git a/src/core/tmtcpacket/SpacePacketBase.cpp b/src/core/tmtcpacket/SpacePacketBase.cpp index 14198027..e9a0b836 100644 --- a/src/core/tmtcpacket/SpacePacketBase.cpp +++ b/src/core/tmtcpacket/SpacePacketBase.cpp @@ -1,5 +1,6 @@ -#include "SpacePacketBase.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/tmtcpacket/SpacePacketBase.h" +#include "fsfw/serviceinterface/ServiceInterface.h" + #include SpacePacketBase::SpacePacketBase( const uint8_t* set_address ) { diff --git a/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp b/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp index 05e176ef..7f8aae9a 100644 --- a/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp +++ b/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp @@ -1,7 +1,7 @@ -#include "ApidMatcher.h" -#include "PacketMatchTree.h" -#include "ServiceMatcher.h" -#include "SubserviceMatcher.h" +#include "fsfw/tmtcpacket/packetmatcher/ApidMatcher.h" +#include "fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h" +#include "fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h" +#include "fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h" // This should be configurable.. const LocalPool::LocalPoolConfig PacketMatchTree::poolConfig = { diff --git a/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp b/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp index dd576fec..0c7a4183 100644 --- a/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp +++ b/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp @@ -1,8 +1,8 @@ -#include "TcPacketBase.h" +#include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h" -#include "../../../globalfunctions/CRC.h" -#include "../../../globalfunctions/arrayprinter.h" -#include "../../../serviceinterface/ServiceInterface.h" +#include "fsfw/globalfunctions/CRC.h" +#include "fsfw/globalfunctions/arrayprinter.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #include diff --git a/src/core/tmtcservices/CommandingServiceBase.cpp b/src/core/tmtcservices/CommandingServiceBase.cpp index 307a2a98..10805b47 100644 --- a/src/core/tmtcservices/CommandingServiceBase.cpp +++ b/src/core/tmtcservices/CommandingServiceBase.cpp @@ -1,14 +1,13 @@ -#include "AcceptsTelemetryIF.h" -#include "CommandingServiceBase.h" -#include "TmTcMessage.h" -#include +#include "fsfw/tmtcservices/CommandingServiceBase.h" +#include "fsfw/tmtcservices/AcceptsTelemetryIF.h" +#include "fsfw/tmtcservices/TmTcMessage.h" -#include "../tcdistribution/PUSDistributorIF.h" -#include "../objectmanager/ObjectManager.h" -#include "../ipc/QueueFactory.h" -#include "../tmtcpacket/pus/tc.h" -#include "../tmtcpacket/pus/tm.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/tcdistribution/PUSDistributorIF.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/ipc/QueueFactory.h" +#include "fsfw/tmtcpacket/pus/tc.h" +#include "fsfw/tmtcpacket/pus/tm.h" +#include "fsfw/serviceinterface/ServiceInterface.h" object_id_t CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT; object_id_t CommandingServiceBase::defaultPacketDestination = objects::NO_OBJECT; diff --git a/src/core/tmtcservices/PusServiceBase.cpp b/src/core/tmtcservices/PusServiceBase.cpp index 811c9bcb..866e0844 100644 --- a/src/core/tmtcservices/PusServiceBase.cpp +++ b/src/core/tmtcservices/PusServiceBase.cpp @@ -1,12 +1,12 @@ -#include "PusServiceBase.h" -#include "AcceptsTelemetryIF.h" -#include "PusVerificationReport.h" -#include "TmTcMessage.h" +#include "fsfw/tmtcservices/PusServiceBase.h" +#include "fsfw/tmtcservices/AcceptsTelemetryIF.h" +#include "fsfw/tmtcservices/PusVerificationReport.h" +#include "fsfw/tmtcservices/TmTcMessage.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" -#include "../tcdistribution/PUSDistributorIF.h" -#include "../ipc/QueueFactory.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" +#include "fsfw/tcdistribution/PUSDistributorIF.h" +#include "fsfw/ipc/QueueFactory.h" object_id_t PusServiceBase::packetSource = 0; object_id_t PusServiceBase::packetDestination = 0; diff --git a/src/core/tmtcservices/PusVerificationReport.cpp b/src/core/tmtcservices/PusVerificationReport.cpp index c64e5feb..827486ce 100644 --- a/src/core/tmtcservices/PusVerificationReport.cpp +++ b/src/core/tmtcservices/PusVerificationReport.cpp @@ -1,5 +1,5 @@ -#include "../serialize/SerializeAdapter.h" -#include "../tmtcservices/PusVerificationReport.h" +#include "fsfw/serialize/SerializeAdapter.h" +#include "fsfw/tmtcservices/PusVerificationReport.h" PusVerificationMessage::PusVerificationMessage() { } diff --git a/src/opt/coordinates/CoordinateTransformations.cpp b/src/opt/coordinates/CoordinateTransformations.cpp index 4e2debbe..fe879dd1 100644 --- a/src/opt/coordinates/CoordinateTransformations.cpp +++ b/src/opt/coordinates/CoordinateTransformations.cpp @@ -1,8 +1,9 @@ -#include "CoordinateTransformations.h" -#include "../globalfunctions/constants.h" -#include "../globalfunctions/math/MatrixOperations.h" -#include "../globalfunctions/math/VectorOperations.h" -#include +#include "fsfw/coordinates/CoordinateTransformations.h" +#include "fsfw/globalfunctions/constants.h" +#include "fsfw/globalfunctions/math/MatrixOperations.h" +#include "fsfw/globalfunctions/math/VectorOperations.h" + +#include #include @@ -17,11 +18,13 @@ void CoordinateTransformations::velocityEcfToEci(const double* ecfVelocity, ecfToEci(ecfVelocity, eciVelocity, ecfPosition, timeUTC); } -void CoordinateTransformations::positionEciToEcf(const double* eciCoordinates, double* ecfCoordinates,timeval *timeUTC){ +void CoordinateTransformations::positionEciToEcf(const double* eciCoordinates, + double* ecfCoordinates,timeval *timeUTC){ eciToEcf(eciCoordinates,ecfCoordinates,NULL,timeUTC); }; -void CoordinateTransformations::velocityEciToEcf(const double* eciVelocity,const double* eciPosition, double* ecfVelocity,timeval* timeUTC){ +void CoordinateTransformations::velocityEciToEcf(const double* eciVelocity, + const double* eciPosition, double* ecfVelocity,timeval* timeUTC){ eciToEcf(eciVelocity,ecfVelocity,eciPosition,timeUTC); } diff --git a/src/opt/coordinates/Sgp4Propagator.cpp b/src/opt/coordinates/Sgp4Propagator.cpp index 5cb1497c..a0e66ebd 100644 --- a/src/opt/coordinates/Sgp4Propagator.cpp +++ b/src/opt/coordinates/Sgp4Propagator.cpp @@ -1,10 +1,13 @@ -#include "CoordinateTransformations.h" -#include "Sgp4Propagator.h" -#include "../globalfunctions/constants.h" -#include "../globalfunctions/math/MatrixOperations.h" -#include "../globalfunctions/math/VectorOperations.h" -#include "../globalfunctions/timevalOperations.h" +#include "fsfw/coordinates/CoordinateTransformations.h" +#include "fsfw/coordinates/Sgp4Propagator.h" + +#include "fsfw/globalfunctions/constants.h" +#include "fsfw/globalfunctions/math/MatrixOperations.h" +#include "fsfw/globalfunctions/math/VectorOperations.h" +#include "fsfw/globalfunctions/timevalOperations.h" + #include + Sgp4Propagator::Sgp4Propagator() : initialized(false), epoch({0, 0}), whichconst(wgs84) { diff --git a/src/opt/datalinklayer/Clcw.cpp b/src/opt/datalinklayer/Clcw.cpp index 13971929..9f2fe7d3 100644 --- a/src/opt/datalinklayer/Clcw.cpp +++ b/src/opt/datalinklayer/Clcw.cpp @@ -1,14 +1,5 @@ -/** - * @file Clcw.cpp - * @brief This file defines the Clcw class. - * @date 17.04.2013 - * @author baetz - */ - - - -#include "Clcw.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/datalinklayer/Clcw.h" +#include "fsfw/serviceinterface/ServiceInterface.h" Clcw::Clcw() { content.raw = 0; diff --git a/src/opt/datalinklayer/DataLinkLayer.cpp b/src/opt/datalinklayer/DataLinkLayer.cpp index 1bdaa4f5..94199bc4 100644 --- a/src/opt/datalinklayer/DataLinkLayer.cpp +++ b/src/opt/datalinklayer/DataLinkLayer.cpp @@ -1,6 +1,6 @@ -#include "DataLinkLayer.h" -#include "../globalfunctions/CRC.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "fsfw/datalinklayer/DataLinkLayer.h" +#include "fsfw/globalfunctions/CRC.h" +#include "fsfw/serviceinterface/ServiceInterface.h" DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw, uint8_t set_start_sequence_length, uint16_t set_scid) : diff --git a/src/opt/datalinklayer/Farm1StateLockout.cpp b/src/opt/datalinklayer/Farm1StateLockout.cpp index 1b339a85..b74d0a5f 100644 --- a/src/opt/datalinklayer/Farm1StateLockout.cpp +++ b/src/opt/datalinklayer/Farm1StateLockout.cpp @@ -1,16 +1,8 @@ -/** - * @file Farm1StateLockout.cpp - * @brief This file defines the Farm1StateLockout class. - * @date 24.04.2013 - * @author baetz - */ +#include "fsfw/datalinklayer/ClcwIF.h" +#include "fsfw/datalinklayer/Farm1StateLockout.h" +#include "fsfw/datalinklayer/TcTransferFrame.h" +#include "fsfw/datalinklayer/VirtualChannelReception.h" - - -#include "ClcwIF.h" -#include "Farm1StateLockout.h" -#include "TcTransferFrame.h" -#include "VirtualChannelReception.h" Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) { } diff --git a/src/opt/datalinklayer/Farm1StateOpen.cpp b/src/opt/datalinklayer/Farm1StateOpen.cpp index 61c0997f..6f91df47 100644 --- a/src/opt/datalinklayer/Farm1StateOpen.cpp +++ b/src/opt/datalinklayer/Farm1StateOpen.cpp @@ -1,17 +1,7 @@ -/** - * @file Farm1StateOpen.cpp - * @brief This file defines the Farm1StateOpen class. - * @date 24.04.2013 - * @author baetz - */ - - - - -#include "ClcwIF.h" -#include "Farm1StateOpen.h" -#include "TcTransferFrame.h" -#include "VirtualChannelReception.h" +#include "fsfw/datalinklayer/ClcwIF.h" +#include "fsfw/datalinklayer/Farm1StateOpen.h" +#include "fsfw/datalinklayer/TcTransferFrame.h" +#include "fsfw/datalinklayer/VirtualChannelReception.h" Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) { }