mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

a lot of internal include replacements

Browse Source
This commit is contained in:
Robin Müller 2021-07-13 20:22:54 +02:00
parent ca297a7dcd
commit 936d0e9f0c
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
163 changed files with 558 additions and 563 deletions
CMakeLists.txt
hal/src/linux/uart
CMakeLists.txt
inc/fsfw
action.h
action
ActionMessage.hCommandActionHelper.h
container
SharedRingBuffer.h
controller
ControllerBase.hExtendedControllerBase.h
coordinates
CoordinateTransformations.hSgp4Propagator.h
datalinklayer
Clcw.hFarm1StateLockout.h
datapool
HkSwitchHelper.hPoolDataSetBase.h
datapoollocal
LocalDataPoolManager.hLocalPoolDataSetBase.hLocalPoolObjectBase.h
internal
LocalDpManagerAttorney.h
devicehandlers
HealthDevice.h
events
EventMessage.h
fdir
FaultCounter.h
globalfunctions
Type.h
health
HealthMessage.h
housekeeping
HousekeepingMessage.hPeriodicHousekeepingHelper.h
internalerror
InternalErrorDataset.hInternalErrorReporter.hInternalErrorReporterIF.h
ipc
MessageQueueMessage.h
modes
ModeHelper.h
objectmanager
SystemObject.h
power
PowerComponent.hPowerSensor.h
serialize
SerialBufferAdapter.h
storagemanager
LocalPool.h
subsystem/modes
ModeSequenceMessage.h
tasks
FixedSequenceSlot.h
tcdistribution
PUSDistributor.hTcDistributor.h
thermal
AbstractTemperatureSensor.hHeater.h
timemanager
Clock.h
tmtcpacket
packetmatcher
PacketMatchTree.h
pus
tc
TcPacketBase.h
tm
TmPacketStoredBase.h
tmtcservices
CommandingServiceBase.hPusServiceBase.hPusVerificationReport.h
src/core
CMakeLists.txt
action
ActionHelper.cppActionMessage.cppCommandActionHelper.cppSimpleActionHelper.cpp
container
SharedRingBuffer.cppSimpleRingBuffer.cpp
controller
ControllerBase.cppExtendedControllerBase.cpp
datapool
HkSwitchHelper.cppPoolDataSetBase.cppPoolEntry.cpp
datapoollocal
LocalDataPoolManager.cppLocalDataSet.cppLocalPoolDataSetBase.cppLocalPoolObjectBase.cppSharedLocalDataSet.cpp
internal
HasLocalDpIFManagerAttorney.cppHasLocalDpIFManagerAttorney.hHasLocalDpIFUserAttorney.cppLocalPoolDataSetAttorney.h
devicehandlers
AssemblyBase.cppCMakeLists.txtChildHandlerBase.cppChildHandlerFDIR.cppDeviceHandlerBase.cppDeviceHandlerFailureIsolation.cppDeviceHandlerMessage.cppDeviceTmReportingWrapper.cppHealthDevice.cpp
events
CMakeLists.txtEventManager.cppEventMessage.cpp
eventmatching
CMakeLists.txtEventIdRangeMatcher.cppEventMatchTree.cppReporterRangeMatcher.cppSeverityRangeMatcher.cpp
fdir
EventCorrelation.cppFailureIsolationBase.cppFaultCounter.cpp
globalfunctions
AsciiConverter.cppCRC.cppDleEncoder.cppPeriodicOperationDivider.cppType.cpparrayprinter.cppbitutility.cpp
math
QuaternionOperations.cpp
timevalOperations.cpp
health
HealthHelper.cppHealthMessage.cpp
Show More

3
CMakeLists.txt

@ -15,6 +15,7 @@ option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON)
set(LIB_FSFW_NAME fsfw) set(LIB_FSFW_NAME fsfw)
add_library(${LIB_FSFW_NAME}) add_library(${LIB_FSFW_NAME})
set(FSFW_CORE_INC_PATH "inc")
set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux rtems freertos) set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux rtems freertos)
@ -154,6 +155,7 @@ endif()
target_include_directories(${LIB_FSFW_NAME} INTERFACE target_include_directories(${LIB_FSFW_NAME} INTERFACE
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${FSFW_CONFIG_PATH_ABSOLUTE} ${FSFW_CONFIG_PATH_ABSOLUTE}
${FSFW_CORE_INC_PATH}
${FSFW_ADD_INC_PATHS_ABS} ${FSFW_ADD_INC_PATHS_ABS}
) )
@ -163,6 +165,7 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
target_include_directories(${LIB_FSFW_NAME} PRIVATE target_include_directories(${LIB_FSFW_NAME} PRIVATE
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${FSFW_CONFIG_PATH_ABSOLUTE} ${FSFW_CONFIG_PATH_ABSOLUTE}
${FSFW_CORE_INC_PATH}
${FSFW_ADD_INC_PATHS_ABS} ${FSFW_ADD_INC_PATHS_ABS}
) )

4
hal/src/linux/uart/CMakeLists.txt

@ -2,7 +2,3 @@ target_sources(${TARGET_NAME} PUBLIC
UartComIF.cpp UartComIF.cpp
UartCookie.cpp UartCookie.cpp
) )

11
inc/fsfw/action.h Normal file

@ -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_ */

6
inc/fsfw/action/ActionMessage.h

@ -1,9 +1,9 @@
#ifndef FSFW_ACTION_ACTIONMESSAGE_H_ #ifndef FSFW_ACTION_ACTIONMESSAGE_H_
#define FSFW_ACTION_ACTIONMESSAGE_H_ #define FSFW_ACTION_ACTIONMESSAGE_H_
#include "../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
using ActionId_t = uint32_t; using ActionId_t = uint32_t;

10
inc/fsfw/action/CommandActionHelper.h

@ -2,11 +2,11 @@
#define COMMANDACTIONHELPER_H_ #define COMMANDACTIONHELPER_H_
#include "ActionMessage.h" #include "ActionMessage.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../serialize/SerializeIF.h" #include "fsfw/serialize/SerializeIF.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
class CommandsActionsIF; class CommandsActionsIF;

7
inc/fsfw/container/SharedRingBuffer.h

@ -3,9 +3,10 @@
#include "SimpleRingBuffer.h" #include "SimpleRingBuffer.h"
#include "DynamicFIFO.h" #include "DynamicFIFO.h"
#include "../ipc/MutexIF.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/ipc/MutexIF.h"
#include "../timemanager/Clock.h" #include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/timemanager/Clock.h"
/** /**
* @brief Ring buffer which can be shared among multiple objects * @brief Ring buffer which can be shared among multiple objects

16
inc/fsfw/controller/ControllerBase.h

@ -1,14 +1,14 @@
#ifndef FSFW_CONTROLLER_CONTROLLERBASE_H_ #ifndef FSFW_CONTROLLER_CONTROLLERBASE_H_
#define FSFW_CONTROLLER_CONTROLLERBASE_H_ #define FSFW_CONTROLLER_CONTROLLERBASE_H_
#include "../health/HasHealthIF.h" #include "fsfw/health/HasHealthIF.h"
#include "../health/HealthHelper.h" #include "fsfw/health/HealthHelper.h"
#include "../modes/HasModesIF.h" #include "fsfw/modes/HasModesIF.h"
#include "../modes/ModeHelper.h" #include "fsfw/modes/ModeHelper.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../tasks/PeriodicTaskIF.h" #include "fsfw/tasks/PeriodicTaskIF.h"
#include "../datapool/HkSwitchHelper.h" #include "fsfw/datapool/HkSwitchHelper.h"
/** /**
* @brief Generic base class for controller classes * @brief Generic base class for controller classes

7
inc/fsfw/controller/ExtendedControllerBase.h

@ -3,10 +3,9 @@
#include "ControllerBase.h" #include "ControllerBase.h"
#include "../action/HasActionsIF.h" #include "fsfw/action.h"
#include "../datapoollocal/HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
#include "../action/ActionHelper.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "../datapoollocal/LocalDataPoolManager.h"
/** /**
* @brief Extendes the basic ControllerBase with the common components * @brief Extendes the basic ControllerBase with the common components

2
inc/fsfw/coordinates/CoordinateTransformations.h

@ -1,7 +1,7 @@
#ifndef COORDINATETRANSFORMATIONS_H_ #ifndef COORDINATETRANSFORMATIONS_H_
#define COORDINATETRANSFORMATIONS_H_ #define COORDINATETRANSFORMATIONS_H_
#include "../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include <cstring> #include <cstring>
class CoordinateTransformations { class CoordinateTransformations {

7
inc/fsfw/coordinates/Sgp4Propagator.h

@ -1,11 +1,12 @@
#ifndef SGP4PROPAGATOR_H_ #ifndef SGP4PROPAGATOR_H_
#define SGP4PROPAGATOR_H_ #define SGP4PROPAGATOR_H_
#ifndef WIN32 #include "fsfw/platform.h"
#ifndef PLATFORM_WIN
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "../contrib/sgp4/sgp4unit.h" #include "fsfw/contrib/sgp4/sgp4unit.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
class Sgp4Propagator { class Sgp4Propagator {
public: public:

7
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_ #ifndef CLCW_H_
#define CLCW_H_ #define CLCW_H_

7
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_ #ifndef FARM1STATELOCKOUT_H_
#define FARM1STATELOCKOUT_H_ #define FARM1STATELOCKOUT_H_

6
inc/fsfw/datapool/HkSwitchHelper.h

@ -1,9 +1,9 @@
#ifndef FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ #ifndef FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_
#define FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ #define FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../action/CommandsActionsIF.h" #include "fsfw/action/CommandsActionsIF.h"
#include "../events/EventReportingProxyIF.h" #include "fsfw/events/EventReportingProxyIF.h"
//TODO this class violations separation between mission and framework //TODO this class violations separation between mission and framework
//but it is only a transitional solution until the Datapool is //but it is only a transitional solution until the Datapool is

5
inc/fsfw/datapool/PoolDataSetBase.h

@ -3,8 +3,9 @@
#include "PoolDataSetIF.h" #include "PoolDataSetIF.h"
#include "PoolVariableIF.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. * @brief The DataSetBase class manages a set of locally checked out variables.

22
inc/fsfw/datapoollocal/LocalDataPoolManager.h

@ -4,17 +4,17 @@
#include "ProvidesDataPoolSubscriptionIF.h" #include "ProvidesDataPoolSubscriptionIF.h"
#include "AccessLocalPoolF.h" #include "AccessLocalPoolF.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../housekeeping/HousekeepingPacketDownlink.h" #include "fsfw/housekeeping/HousekeepingPacketDownlink.h"
#include "../housekeeping/HousekeepingMessage.h" #include "fsfw/housekeeping/HousekeepingMessage.h"
#include "../housekeeping/PeriodicHousekeepingHelper.h" #include "fsfw/housekeeping/PeriodicHousekeepingHelper.h"
#include "../datapool/DataSetIF.h" #include "fsfw/datapool/DataSetIF.h"
#include "../datapool/PoolEntry.h" #include "fsfw/datapool/PoolEntry.h"
#include "../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
#include "../ipc/MutexIF.h" #include "fsfw/ipc/MutexIF.h"
#include "../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "../ipc/MutexGuard.h" #include "fsfw/ipc/MutexGuard.h"
#include <map> #include <map>
#include <vector> #include <vector>

4
inc/fsfw/datapoollocal/LocalPoolDataSetBase.h

@ -4,8 +4,8 @@
#include "MarkChangedIF.h" #include "MarkChangedIF.h"
#include "localPoolDefinitions.h" #include "localPoolDefinitions.h"
#include "../datapool/DataSetIF.h" #include "fsfw/datapool/DataSetIF.h"
#include "../datapool/PoolDataSetBase.h" #include "fsfw/datapool/PoolDataSetBase.h"
#include <vector> #include <vector>

6
inc/fsfw/datapoollocal/LocalPoolObjectBase.h

@ -4,9 +4,9 @@
#include "MarkChangedIF.h" #include "MarkChangedIF.h"
#include "localPoolDefinitions.h" #include "localPoolDefinitions.h"
#include "../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
#include "../datapool/PoolVariableIF.h" #include "fsfw/datapool/PoolVariableIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
class LocalDataPoolManager; class LocalDataPoolManager;
class DataSetIF; class DataSetIF;

0
src/core/datapoollocal/internal/LocalDpManagerAttorney.h → inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h

10
inc/fsfw/devicehandlers/HealthDevice.h

@ -1,11 +1,11 @@
#ifndef FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_ #ifndef FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_
#define FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_ #define FSFW_DEVICEHANDLERS_HEALTHDEVICE_H_
#include "../health/HasHealthIF.h" #include "fsfw/health/HasHealthIF.h"
#include "../health/HealthHelper.h" #include "fsfw/health/HealthHelper.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
class HealthDevice: public SystemObject, class HealthDevice: public SystemObject,
public ExecutableObjectIF, public ExecutableObjectIF,

10
inc/fsfw/events/EventMessage.h

@ -1,9 +1,9 @@
#ifndef EVENTMESSAGE_H_ #ifndef FSFW_EVENTS_EVENTMESSAGE_H_
#define EVENTMESSAGE_H_ #define FSFW_EVENTS_EVENTMESSAGE_H_
#include "Event.h" #include "Event.h"
#include "../ipc/MessageQueueMessage.h" #include "fsfw/ipc/MessageQueueMessage.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
/** /**
* Passing on events through IPC. * Passing on events through IPC.
@ -49,4 +49,4 @@ protected:
}; };
#endif /* EVENTMESSAGE_H_ */ #endif /* FSFW_EVENTS_EVENTMESSAGE_H_ */

10
inc/fsfw/fdir/FaultCounter.h

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_FDIR_FAULTCOUNTER_H_ #ifndef FSFW_FDIR_FAULTCOUNTER_H_
#define FRAMEWORK_FDIR_FAULTCOUNTER_H_ #define FSFW_FDIR_FAULTCOUNTER_H_
#include "../parameters/HasParametersIF.h" #include "fsfw/parameters/HasParametersIF.h"
#include "../timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
class FaultCounter: public HasParametersIF { class FaultCounter: public HasParametersIF {
public: public:
@ -35,4 +35,4 @@ private:
uint32_t failureThreshold; uint32_t failureThreshold;
}; };
#endif /* FRAMEWORK_FDIR_FAULTCOUNTER_H_ */ #endif /* FSFW_FDIR_FAULTCOUNTER_H_ */

5
inc/fsfw/globalfunctions/Type.h

@ -1,8 +1,9 @@
#ifndef FSFW_GLOBALFUNCTIONS_TYPE_H_ #ifndef FSFW_GLOBALFUNCTIONS_TYPE_H_
#define FSFW_GLOBALFUNCTIONS_TYPE_H_ #define FSFW_GLOBALFUNCTIONS_TYPE_H_
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../serialize/SerializeIF.h" #include "fsfw/serialize/SerializeIF.h"
#include <type_traits> #include <type_traits>
/** /**

2
inc/fsfw/health/HealthMessage.h

@ -2,7 +2,7 @@
#define FSFW_HEALTH_HEALTHMESSAGE_H_ #define FSFW_HEALTH_HEALTHMESSAGE_H_
#include "HasHealthIF.h" #include "HasHealthIF.h"
#include "../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
class HealthMessage { class HealthMessage {
public: public:

10
inc/fsfw/housekeeping/HousekeepingMessage.h

@ -1,11 +1,11 @@
#ifndef FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_ #ifndef FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_
#define FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_ #define FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_
#include "../datapoollocal/localPoolDefinitions.h" #include "fsfw/datapoollocal/localPoolDefinitions.h"
#include "../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
#include "../ipc/FwMessageTypes.h" #include "fsfw/ipc/FwMessageTypes.h"
#include "../objectmanager/frameworkObjects.h" #include "fsfw/objectmanager/frameworkObjects.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
/** /**

2
inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h

@ -1,7 +1,7 @@
#ifndef FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_ #ifndef FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_
#define FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_ #define FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_
#include "../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include <cstdint> #include <cstdint>
class LocalPoolDataSetBase; class LocalPoolDataSetBase;

0
inc/fsfw/internalError/InternalErrorDataset.h → inc/fsfw/internalerror/InternalErrorDataset.h

12
inc/fsfw/internalError/InternalErrorReporter.h → inc/fsfw/internalerror/InternalErrorReporter.h

@ -3,12 +3,12 @@
#include "InternalErrorReporterIF.h" #include "InternalErrorReporterIF.h"
#include "../tasks/PeriodicTaskIF.h" #include "fsfw/tasks/PeriodicTaskIF.h"
#include "../internalError/InternalErrorDataset.h" #include "fsfw/internalerror/InternalErrorDataset.h"
#include "../datapoollocal/LocalDataPoolManager.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../ipc/MutexIF.h" #include "fsfw/ipc/MutexIF.h"
/** /**
* @brief This class is used to track internal errors like lost telemetry, * @brief This class is used to track internal errors like lost telemetry,

0
inc/fsfw/internalError/InternalErrorReporterIF.h → inc/fsfw/internalerror/InternalErrorReporterIF.h

2
inc/fsfw/ipc/MessageQueueMessage.h

@ -1,7 +1,7 @@
#ifndef FSFW_IPC_MESSAGEQUEUEMESSAGE_H_ #ifndef FSFW_IPC_MESSAGEQUEUEMESSAGE_H_
#define FSFW_IPC_MESSAGEQUEUEMESSAGE_H_ #define FSFW_IPC_MESSAGEQUEUEMESSAGE_H_
#include "../ipc/MessageQueueMessageIF.h" #include "fsfw/ipc/MessageQueueMessageIF.h"
#include <cstddef> #include <cstddef>
/** /**

6
inc/fsfw/modes/ModeHelper.h

@ -2,9 +2,9 @@
#define FSFW_MODES_MODEHELPER_H_ #define FSFW_MODES_MODEHELPER_H_
#include "ModeMessage.h" #include "ModeMessage.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
class HasModesIF; class HasModesIF;

6
inc/fsfw/objectmanager/SystemObject.h

@ -2,9 +2,9 @@
#define FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_ #define FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_
#include "SystemObjectIF.h" #include "SystemObjectIF.h"
#include "../events/Event.h" #include "fsfw/events/Event.h"
#include "../events/EventReportingProxyIF.h" #include "fsfw/events/EventReportingProxyIF.h"
#include "../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
/** /**
* @brief This class automates insertion into the ObjectManager and * @brief This class automates insertion into the ObjectManager and

4
inc/fsfw/power/PowerComponent.h

@ -3,8 +3,8 @@
#include "PowerComponentIF.h" #include "PowerComponentIF.h"
#include "../objectmanager/frameworkObjects.h" #include "fsfw/objectmanager/frameworkObjects.h"
#include "../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
class PowerComponent: public PowerComponentIF { class PowerComponent: public PowerComponentIF {

12
inc/fsfw/power/PowerSensor.h

@ -1,12 +1,12 @@
#ifndef FSFW_POWER_POWERSENSOR_H_ #ifndef FSFW_POWER_POWERSENSOR_H_
#define FSFW_POWER_POWERSENSOR_H_ #define FSFW_POWER_POWERSENSOR_H_
#include "../datapoollocal/StaticLocalDataSet.h" #include "fsfw/datapoollocal/StaticLocalDataSet.h"
#include "../devicehandlers/HealthDevice.h" #include "fsfw/devicehandlers/HealthDevice.h"
#include "../monitoring/LimitMonitor.h" #include "fsfw/monitoring/LimitMonitor.h"
#include "../parameters/ParameterHelper.h" #include "fsfw/parameters/ParameterHelper.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
class PowerController; class PowerController;

4
inc/fsfw/serialize/SerialBufferAdapter.h

@ -1,8 +1,8 @@
#ifndef SERIALBUFFERADAPTER_H_ #ifndef SERIALBUFFERADAPTER_H_
#define SERIALBUFFERADAPTER_H_ #define SERIALBUFFERADAPTER_H_
#include "../serialize/SerializeIF.h" #include "fsfw/serialize/SerializeIF.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
/** /**
* This adapter provides an interface for SerializeIF to serialize or deserialize * This adapter provides an interface for SerializeIF to serialize or deserialize

13
inc/fsfw/storagemanager/LocalPool.h

@ -1,12 +1,13 @@
#ifndef FSFW_STORAGEMANAGER_LOCALPOOL_H_ #ifndef FSFW_STORAGEMANAGER_LOCALPOOL_H_
#define FSFW_STORAGEMANAGER_LOCALPOOL_H_ #define FSFW_STORAGEMANAGER_LOCALPOOL_H_
#include "StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../objectmanager/SystemObject.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../internalError/InternalErrorReporterIF.h" #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include "../storagemanager/StorageAccessor.h" #include "fsfw/internalerror/InternalErrorReporterIF.h"
#include "fsfw/storagemanager/StorageAccessor.h"
#include <vector> #include <vector>
#include <set> #include <set>

4
inc/fsfw/subsystem/modes/ModeSequenceMessage.h

@ -3,8 +3,8 @@
#include "ModeDefinitions.h" #include "ModeDefinitions.h"
#include "../../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
#include "../../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
class ModeSequenceMessage { class ModeSequenceMessage {

2
inc/fsfw/tasks/FixedSequenceSlot.h

@ -2,7 +2,7 @@
#define FSFW_TASKS_FIXEDSEQUENCESLOT_H_ #define FSFW_TASKS_FIXEDSEQUENCESLOT_H_
#include "ExecutableObjectIF.h" #include "ExecutableObjectIF.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
class PeriodicTaskIF; class PeriodicTaskIF;

8
inc/fsfw/tcdistribution/PUSDistributor.h

@ -5,10 +5,10 @@
#include "TcDistributor.h" #include "TcDistributor.h"
#include "TcPacketCheck.h" #include "TcPacketCheck.h"
#include "../tmtcpacket/pus/tc.h" #include "fsfw/tmtcpacket/pus/tc.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../tmtcservices/AcceptsTelecommandsIF.h" #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
#include "../tmtcservices/VerificationReporter.h" #include "fsfw/tmtcservices/VerificationReporter.h"
/** /**
* This class accepts PUS Telecommands and forwards them to Application * This class accepts PUS Telecommands and forwards them to Application

14
inc/fsfw/tcdistribution/TcDistributor.h

@ -1,13 +1,13 @@
#ifndef FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_ #ifndef FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_
#define FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_ #define FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include <map> #include <map>
/** /**

12
inc/fsfw/thermal/AbstractTemperatureSensor.h

@ -1,12 +1,12 @@
#ifndef ABSTRACTSENSOR_H_ #ifndef ABSTRACTSENSOR_H_
#define ABSTRACTSENSOR_H_ #define ABSTRACTSENSOR_H_
#include "../health/HasHealthIF.h" #include "fsfw/health/HasHealthIF.h"
#include "../health/HealthHelper.h" #include "fsfw/health/HealthHelper.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../parameters/ParameterHelper.h" #include "fsfw/parameters/ParameterHelper.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "ThermalModuleIF.h" #include "ThermalModuleIF.h"
#include "tcsDefinitions.h" #include "tcsDefinitions.h"

11
inc/fsfw/thermal/Heater.h

@ -1,11 +1,12 @@
#ifndef FSFW_THERMAL_HEATER_H_ #ifndef FSFW_THERMAL_HEATER_H_
#define FSFW_THERMAL_HEATER_H_ #define FSFW_THERMAL_HEATER_H_
#include "../devicehandlers/HealthDevice.h" #include "fsfw/devicehandlers/HealthDevice.h"
#include "../parameters/ParameterHelper.h" #include "fsfw/parameters/ParameterHelper.h"
#include "../power/PowerSwitchIF.h" #include "fsfw/power/PowerSwitchIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
#include <cstdint> #include <cstdint>

6
inc/fsfw/timemanager/Clock.h

@ -2,9 +2,9 @@
#define FSFW_TIMEMANAGER_CLOCK_H_ #define FSFW_TIMEMANAGER_CLOCK_H_
#include "clockDefinitions.h" #include "clockDefinitions.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../ipc/MutexFactory.h" #include "fsfw/ipc/MutexFactory.h"
#include "../globalfunctions/timevalOperations.h" #include "fsfw/globalfunctions/timevalOperations.h"
#include <cstdint> #include <cstdint>

8
inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h

@ -1,10 +1,10 @@
#ifndef FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_ #ifndef FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_
#define FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_ #define FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_
#include "../../container/PlacementFactory.h" #include "fsfw/container/PlacementFactory.h"
#include "../../globalfunctions/matching/MatchTree.h" #include "fsfw/globalfunctions/matching/MatchTree.h"
#include "../../storagemanager/LocalPool.h" #include "fsfw/storagemanager/LocalPool.h"
#include "../../tmtcpacket/pus/tm/TmPacketMinimal.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h"
class PacketMatchTree: public MatchTree<TmPacketMinimal*>, public HasReturnvaluesIF { class PacketMatchTree: public MatchTree<TmPacketMinimal*>, public HasReturnvaluesIF {
public: public:

2
inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h

@ -1,7 +1,7 @@
#ifndef TMTCPACKET_PUS_TCPACKETBASE_H_ #ifndef TMTCPACKET_PUS_TCPACKETBASE_H_
#define TMTCPACKET_PUS_TCPACKETBASE_H_ #define TMTCPACKET_PUS_TCPACKETBASE_H_
#include "../../../tmtcpacket/SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include <cstddef> #include <cstddef>
/** /**

10
inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h

@ -1,15 +1,15 @@
#ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_ #ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_
#define FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_ #define FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_
#include "../../../FSFW.h" #include "fsfw/FSFW.h"
#include "TmPacketBase.h" #include "TmPacketBase.h"
#include "TmPacketStoredBase.h" #include "TmPacketStoredBase.h"
#include "TmPacketPusA.h" #include "TmPacketPusA.h"
#include "../../../serialize/SerializeIF.h" #include "fsfw/serialize/SerializeIF.h"
#include "../../../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../../../internalError/InternalErrorReporterIF.h" #include "fsfw/internalerror/InternalErrorReporterIF.h"
#include "../../../ipc/MessageQueueSenderIF.h" #include "fsfw/ipc/MessageQueueSenderIF.h"
/** /**
* This class generates a ECSS PUS Telemetry packet within a given * This class generates a ECSS PUS Telemetry packet within a given

19
inc/fsfw/tmtcservices/CommandingServiceBase.h

@ -3,17 +3,16 @@
#include "AcceptsTelecommandsIF.h" #include "AcceptsTelecommandsIF.h"
#include "VerificationReporter.h" #include "VerificationReporter.h"
#include "fsfw/FSFW.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "../ipc/CommandMessage.h" #include "fsfw/ipc/CommandMessage.h"
#include "../container/FixedMap.h" #include "fsfw/container/FixedMap.h"
#include "../container/FIFO.h" #include "fsfw/container/FIFO.h"
#include "../serialize/SerializeIF.h" #include "fsfw/serialize/SerializeIF.h"
#include <FSFWConfig.h>
class TcPacketStored; class TcPacketStored;
class TcPacketStoredBase; class TcPacketStoredBase;

12
inc/fsfw/tmtcservices/PusServiceBase.h

@ -5,12 +5,12 @@
#include "VerificationCodes.h" #include "VerificationCodes.h"
#include "VerificationReporter.h" #include "VerificationReporter.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
#include "../tmtcpacket/pus/tc.h" #include "fsfw/tmtcpacket/pus/tc.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();

6
inc/fsfw/tmtcservices/PusVerificationReport.h

@ -3,9 +3,9 @@
#include "VerificationCodes.h" #include "VerificationCodes.h"
#include "../ipc/MessageQueueMessage.h" #include "fsfw/ipc/MessageQueueMessage.h"
#include "../tmtcpacket/pus/tc/TcPacketBase.h" #include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
class PusVerificationMessage: public MessageQueueMessage { class PusVerificationMessage: public MessageQueueMessage {
private: private:

3
src/core/CMakeLists.txt

@ -9,7 +9,7 @@ add_subdirectory(fdir)
add_subdirectory(globalfunctions) add_subdirectory(globalfunctions)
add_subdirectory(health) add_subdirectory(health)
add_subdirectory(housekeeping) add_subdirectory(housekeeping)
add_subdirectory(internalError) add_subdirectory(internalerror)
add_subdirectory(ipc) add_subdirectory(ipc)
add_subdirectory(memory) add_subdirectory(memory)
add_subdirectory(modes) add_subdirectory(modes)
@ -24,6 +24,5 @@ add_subdirectory(tasks)
add_subdirectory(tcdistribution) add_subdirectory(tcdistribution)
add_subdirectory(thermal) add_subdirectory(thermal)
add_subdirectory(timemanager) add_subdirectory(timemanager)
add_subdirectory(tmstorage)
add_subdirectory(tmtcpacket) add_subdirectory(tmtcpacket)
add_subdirectory(tmtcservices) add_subdirectory(tmtcservices)

9
src/core/action/ActionHelper.cpp

@ -1,9 +1,8 @@
#include "ActionHelper.h" #include "fsfw/action.h"
#include "HasActionsIF.h"
#include "../ipc/MessageQueueSenderIF.h" #include "fsfw/ipc/MessageQueueSenderIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
ActionHelper::ActionHelper(HasActionsIF* setOwner, ActionHelper::ActionHelper(HasActionsIF* setOwner,
MessageQueueIF* useThisQueue) : MessageQueueIF* useThisQueue) :

7
src/core/action/ActionMessage.cpp

@ -1,8 +1,7 @@
#include "ActionMessage.h" #include "fsfw/action.h"
#include "HasActionsIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
ActionMessage::ActionMessage() { ActionMessage::ActionMessage() {
} }

7
src/core/action/CommandActionHelper.cpp

@ -1,9 +1,6 @@
#include "ActionMessage.h" #include "fsfw/action.h"
#include "CommandActionHelper.h"
#include "CommandsActionsIF.h"
#include "HasActionsIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) : CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
owner(setOwner), queueToUse(NULL), ipcStore( owner(setOwner), queueToUse(NULL), ipcStore(

3
src/core/action/SimpleActionHelper.cpp

@ -1,5 +1,4 @@
#include "HasActionsIF.h" #include "fsfw/action.h"
#include "SimpleActionHelper.h"
SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner, SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
MessageQueueIF* useThisQueue) : MessageQueueIF* useThisQueue) :

6
src/core/container/SharedRingBuffer.cpp

@ -1,6 +1,6 @@
#include "SharedRingBuffer.h" #include "fsfw/container/SharedRingBuffer.h"
#include "../ipc/MutexFactory.h" #include "fsfw/ipc/MutexFactory.h"
#include "../ipc/MutexGuard.h" #include "fsfw/ipc/MutexGuard.h"
SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size, SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size,
bool overwriteOld, size_t maxExcessBytes): bool overwriteOld, size_t maxExcessBytes):

3
src/core/container/SimpleRingBuffer.cpp

@ -1,4 +1,5 @@
#include "SimpleRingBuffer.h" #include "fsfw/container/SimpleRingBuffer.h"
#include <cstring> #include <cstring>
SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld, SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld,

10
src/core/controller/ControllerBase.cpp

@ -1,9 +1,9 @@
#include "ControllerBase.h" #include "fsfw/controller/ControllerBase.h"
#include "../subsystem/SubsystemBase.h" #include "fsfw/subsystem/SubsystemBase.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../action/HasActionsIF.h" #include "fsfw/action/HasActionsIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
ControllerBase::ControllerBase(object_id_t setObjectId, object_id_t parentId, ControllerBase::ControllerBase(object_id_t setObjectId, object_id_t parentId,
size_t commandQueueDepth) : size_t commandQueueDepth) :

3
src/core/controller/ExtendedControllerBase.cpp

@ -1,5 +1,4 @@
#include "ExtendedControllerBase.h" #include "fsfw/controller/ExtendedControllerBase.h"
ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId, ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId,
object_id_t parentId, size_t commandQueueDepth): object_id_t parentId, size_t commandQueueDepth):

4
src/core/datapool/HkSwitchHelper.cpp

@ -1,5 +1,5 @@
#include "../datapool/HkSwitchHelper.h" #include "fsfw/datapool/HkSwitchHelper.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) : HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) :
commandActionHelper(this), eventProxy(eventProxy) { commandActionHelper(this), eventProxy(eventProxy) {

6
src/core/datapool/PoolDataSetBase.cpp

@ -1,7 +1,7 @@
#include "PoolDataSetBase.h" #include "fsfw/datapool/PoolDataSetBase.h"
#include "ReadCommitIFAttorney.h" #include "fsfw/datapool/ReadCommitIFAttorney.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include <cstring> #include <cstring>

7
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 <cstring> #include <cstring>
#include <algorithm> #include <algorithm>

22
src/core/datapoollocal/LocalDataPoolManager.cpp

@ -1,18 +1,16 @@
#include "HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "LocalDataPoolManager.h" #include "fsfw/datapoollocal.h"
#include "LocalPoolObjectBase.h"
#include "LocalPoolDataSetBase.h"
#include "internal/LocalPoolDataSetAttorney.h" #include "internal/LocalPoolDataSetAttorney.h"
#include "internal/HasLocalDpIFManagerAttorney.h" #include "internal/HasLocalDpIFManagerAttorney.h"
#include "../housekeeping/HousekeepingSetPacket.h" #include "fsfw/housekeeping/HousekeepingSetPacket.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../housekeeping/HousekeepingSnapshot.h" #include "fsfw/housekeeping/HousekeepingSnapshot.h"
#include "../housekeeping/AcceptsHkPacketsIF.h" #include "fsfw/housekeeping/AcceptsHkPacketsIF.h"
#include "../timemanager/CCSDSTime.h" #include "fsfw/timemanager/CCSDSTime.h"
#include "../ipc/MutexFactory.h" #include "fsfw/ipc/MutexFactory.h"
#include "../ipc/MutexGuard.h" #include "fsfw/ipc/MutexGuard.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include <array> #include <array>
#include <cmath> #include <cmath>

7
src/core/datapoollocal/LocalDataSet.cpp

@ -1,6 +1,7 @@
#include "LocalDataSet.h" #include "fsfw/datapoollocal/LocalDataSet.h"
#include "../datapoollocal/LocalDataPoolManager.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "../serialize/SerializeAdapter.h"
#include "fsfw/serialize/SerializeAdapter.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

15
src/core/datapoollocal/LocalPoolDataSetBase.cpp

@ -1,13 +1,12 @@
#include "LocalPoolDataSetBase.h" #include "fsfw/datapoollocal.h"
#include "HasLocalDataPoolIF.h"
#include "internal/HasLocalDpIFUserAttorney.h" #include "internal/HasLocalDpIFUserAttorney.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../globalfunctions/bitutility.h" #include "fsfw/globalfunctions/bitutility.h"
#include "../datapoollocal/LocalDataPoolManager.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "../housekeeping/PeriodicHousekeepingHelper.h" #include "fsfw/housekeeping/PeriodicHousekeepingHelper.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

10
src/core/datapoollocal/LocalPoolObjectBase.cpp

@ -1,10 +1,10 @@
#include "LocalPoolObjectBase.h" #include "fsfw/datapoollocal/LocalPoolObjectBase.h"
#include "LocalDataPoolManager.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h"
#include "AccessLocalPoolF.h" #include "fsfw/datapoollocal/AccessLocalPoolF.h"
#include "HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
#include "internal/HasLocalDpIFUserAttorney.h" #include "internal/HasLocalDpIFUserAttorney.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner, LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner,

2
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, SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, sid_t sid,

6
src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp

@ -1,7 +1,7 @@
#include "HasLocalDpIFManagerAttorney.h" #include "HasLocalDpIFManagerAttorney.h"
#include "../LocalPoolObjectBase.h" #include "fsfw/datapoollocal/LocalPoolObjectBase.h"
#include "../LocalPoolDataSetBase.h" #include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
#include "../HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* clientIF, LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* clientIF,
sid_t sid) { sid_t sid) {

2
src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h

@ -1,7 +1,7 @@
#ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_ #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
#define FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_ #define FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
#include "../localPoolDefinitions.h" #include "fsfw/datapoollocal/localPoolDefinitions.h"
class HasLocalDataPoolIF; class HasLocalDataPoolIF;
class LocalPoolDataSetBase; class LocalPoolDataSetBase;

4
src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp

@ -1,6 +1,6 @@
#include "HasLocalDpIFUserAttorney.h" #include "HasLocalDpIFUserAttorney.h"
#include "../AccessLocalPoolF.h" #include "fsfw/datapoollocal/AccessLocalPoolF.h"
#include "../HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
AccessPoolManagerIF* HasLocalDpIFUserAttorney::getAccessorHandle(HasLocalDataPoolIF *clientIF) { AccessPoolManagerIF* HasLocalDpIFUserAttorney::getAccessorHandle(HasLocalDataPoolIF *clientIF) {
return clientIF->getAccessorHandle(); return clientIF->getAccessorHandle();

2
src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h

@ -1,7 +1,7 @@
#ifndef FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_ #ifndef FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_
#define FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_ #define FSFW_DATAPOOLLOCAL_LOCALPOOLDATASETATTORNEY_H_
#include "../LocalPoolDataSetBase.h" #include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
class LocalPoolDataSetAttorney { class LocalPoolDataSetAttorney {
private: private:

2
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, AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
uint16_t commandQueueDepth) : uint16_t commandQueueDepth) :

10
src/core/devicehandlers/CMakeLists.txt Normal file

@ -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
)

4
src/core/devicehandlers/ChildHandlerBase.cpp

@ -1,5 +1,5 @@
#include "ChildHandlerBase.h" #include "fsfw/devicehandlers/ChildHandlerBase.h"
#include "../subsystem/SubsystemBase.h" #include "fsfw/subsystem/SubsystemBase.h"
ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId, ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
object_id_t deviceCommunication, CookieIF * cookie, object_id_t deviceCommunication, CookieIF * cookie,

2
src/core/devicehandlers/ChildHandlerFDIR.cpp

@ -1,4 +1,4 @@
#include "ChildHandlerFDIR.h" #include "fsfw/devicehandlers/ChildHandlerFDIR.h"
ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner, ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner,
object_id_t faultTreeParent, uint32_t recoveryCount) : object_id_t faultTreeParent, uint32_t recoveryCount) :

26
src/core/devicehandlers/DeviceHandlerBase.cpp

@ -1,17 +1,17 @@
#include "DeviceHandlerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "AcceptsDeviceResponsesIF.h" #include "fsfw/devicehandlers/AcceptsDeviceResponsesIF.h"
#include "DeviceTmReportingWrapper.h" #include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../thermal/ThermalComponentIF.h" #include "fsfw/thermal/ThermalComponentIF.h"
#include "../globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "../housekeeping/HousekeepingMessage.h" #include "fsfw/housekeeping/HousekeepingMessage.h"
#include "../ipc/MessageQueueMessage.h" #include "fsfw/ipc/MessageQueueMessage.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../subsystem/SubsystemBase.h" #include "fsfw/subsystem/SubsystemBase.h"
#include "../datapoollocal/LocalPoolVariable.h" #include "fsfw/datapoollocal/LocalPoolVariable.h"
object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT; object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT; object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT;

16
src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp

@ -1,12 +1,12 @@
#include "DeviceHandlerFailureIsolation.h" #include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h"
#include "../devicehandlers/DeviceHandlerIF.h" #include "fsfw/devicehandlers/DeviceHandlerIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../modes/HasModesIF.h" #include "fsfw/modes/HasModesIF.h"
#include "../health/HealthTableIF.h" #include "fsfw/health/HealthTableIF.h"
#include "../power/Fuse.h" #include "fsfw/power/Fuse.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include "../thermal/ThermalComponentIF.h" #include "fsfw/thermal/ThermalComponentIF.h"
object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = object_id_t DeviceHandlerFailureIsolation::powerConfirmationId =
objects::NO_OBJECT; objects::NO_OBJECT;

4
src/core/devicehandlers/DeviceHandlerMessage.cpp

@ -1,5 +1,5 @@
#include "DeviceHandlerMessage.h" #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
store_address_t DeviceHandlerMessage::getStoreAddress( store_address_t DeviceHandlerMessage::getStoreAddress(
const CommandMessage* message) { const CommandMessage* message) {

4
src/core/devicehandlers/DeviceTmReportingWrapper.cpp

@ -1,5 +1,5 @@
#include "DeviceTmReportingWrapper.h" #include "fsfw/devicehandlers/DeviceTmReportingWrapper.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId, DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
ActionId_t actionId, SerializeIF* data) : ActionId_t actionId, SerializeIF* data) :

4
src/core/devicehandlers/HealthDevice.cpp

@ -1,5 +1,5 @@
#include "HealthDevice.h" #include "fsfw/devicehandlers/HealthDevice.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
HealthDevice::HealthDevice(object_id_t setObjectId, HealthDevice::HealthDevice(object_id_t setObjectId,
MessageQueueId_t parentQueue) : MessageQueueId_t parentQueue) :

3
src/core/events/CMakeLists.txt

@ -1,5 +1,4 @@
target_sources(${LIB_FSFW_NAME} target_sources(${LIB_FSFW_NAME} PRIVATE
PRIVATE
EventManager.cpp EventManager.cpp
EventMessage.cpp EventMessage.cpp
) )

8
src/core/events/EventManager.cpp

@ -1,8 +1,8 @@
#include "EventManager.h" #include "fsfw/events/EventManager.h"
#include "EventMessage.h" #include "fsfw/events/EventMessage.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../ipc/MutexFactory.h" #include "fsfw/ipc/MutexFactory.h"
MessageQueueId_t EventManagerIF::eventmanagerQueue = MessageQueueIF::NO_QUEUE; MessageQueueId_t EventManagerIF::eventmanagerQueue = MessageQueueIF::NO_QUEUE;

2
src/core/events/EventMessage.cpp

@ -1,4 +1,4 @@
#include "EventMessage.h" #include "fsfw/events/EventMessage.h"
#include <cstring> #include <cstring>
EventMessage::EventMessage() { EventMessage::EventMessage() {

0
inc/fsfw/events/eventmatching/CMakeLists.txt → src/core/events/eventmatching/CMakeLists.txt

2
inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp → 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, EventIdRangeMatcher::EventIdRangeMatcher(EventId_t lower, EventId_t upper,
bool inverted) : EventRangeMatcherBase<EventId_t>(lower, upper, inverted) { bool inverted) : EventRangeMatcherBase<EventId_t>(lower, upper, inverted) {

8
inc/fsfw/events/eventmatching/EventMatchTree.cpp → src/core/events/eventmatching/EventMatchTree.cpp

@ -1,7 +1,7 @@
#include "EventIdRangeMatcher.h" #include "fsfw/events/eventmatching/EventIdRangeMatcher.h"
#include "EventMatchTree.h" #include "fsfw/events/eventmatching/EventMatchTree.h"
#include "ReporterRangeMatcher.h" #include "fsfw/events/eventmatching/ReporterRangeMatcher.h"
#include "SeverityRangeMatcher.h" #include "fsfw/events/eventmatching/SeverityRangeMatcher.h"
EventMatchTree::EventMatchTree(StorageManagerIF* storageBackend, EventMatchTree::EventMatchTree(StorageManagerIF* storageBackend,
bool invertedMatch) : bool invertedMatch) :

2
inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp → 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, ReporterRangeMatcher::ReporterRangeMatcher(object_id_t lower, object_id_t upper,
bool inverted) : EventRangeMatcherBase<object_id_t>(lower, upper, inverted) { bool inverted) : EventRangeMatcherBase<object_id_t>(lower, upper, inverted) {

6
inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp → src/core/events/eventmatching/SeverityRangeMatcher.cpp

@ -1,6 +1,6 @@
#include "SeverityRangeMatcher.h" #include "fsfw/events/eventmatching/SeverityRangeMatcher.h"
#include "../../events/EventMessage.h" #include "fsfw/events/EventMessage.h"
#include "../../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
SeverityRangeMatcher::SeverityRangeMatcher(EventSeverity_t from, SeverityRangeMatcher::SeverityRangeMatcher(EventSeverity_t from,
EventSeverity_t till, bool inverted) : EventRangeMatcherBase<EventSeverity_t>(from, till, inverted) { EventSeverity_t till, bool inverted) : EventRangeMatcherBase<EventSeverity_t>(from, till, inverted) {

2
src/core/fdir/EventCorrelation.cpp

@ -1,4 +1,4 @@
#include "EventCorrelation.h" #include "fsfw/fdir/EventCorrelation.h"
EventCorrelation::EventCorrelation(uint32_t timeout) : EventCorrelation::EventCorrelation(uint32_t timeout) :
eventPending(false) { eventPending(false) {

12
src/core/fdir/FailureIsolationBase.cpp

@ -1,9 +1,9 @@
#include "../events/EventManagerIF.h" #include "fsfw/events/EventManagerIF.h"
#include "FailureIsolationBase.h" #include "fsfw/fdir/FailureIsolationBase.h"
#include "../health/HasHealthIF.h" #include "fsfw/health/HasHealthIF.h"
#include "../health/HealthMessage.h" #include "fsfw/health/HealthMessage.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
FailureIsolationBase::FailureIsolationBase(object_id_t owner, FailureIsolationBase::FailureIsolationBase(object_id_t owner,
object_id_t parent, uint8_t messageDepth, uint8_t parameterDomainBase) : object_id_t parent, uint8_t messageDepth, uint8_t parameterDomainBase) :

2
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, FaultCounter::FaultCounter(uint32_t failureThreshold, uint32_t decrementAfterMs,
uint8_t setParameterDomain) : uint8_t setParameterDomain) :

3
src/core/globalfunctions/AsciiConverter.cpp

@ -1,4 +1,5 @@
#include "AsciiConverter.h" #include "fsfw/globalfunctions/AsciiConverter.h"
#include <limits> #include <limits>
#include <cmath> #include <cmath>

2
src/core/globalfunctions/CRC.cpp

@ -1,4 +1,4 @@
#include "CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include <math.h> #include <math.h>
const uint16_t CRC::crc16ccitt_table[256] = { const uint16_t CRC::crc16ccitt_table[256] = {

2
src/core/globalfunctions/DleEncoder.cpp

@ -1,4 +1,4 @@
#include "../globalfunctions/DleEncoder.h" #include "fsfw/globalfunctions/DleEncoder.h"
DleEncoder::DleEncoder() {} DleEncoder::DleEncoder() {}

2
src/core/globalfunctions/PeriodicOperationDivider.cpp

@ -1,4 +1,4 @@
#include "PeriodicOperationDivider.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
PeriodicOperationDivider::PeriodicOperationDivider(uint32_t divider, PeriodicOperationDivider::PeriodicOperationDivider(uint32_t divider,

4
src/core/globalfunctions/Type.cpp

@ -1,5 +1,5 @@
#include "Type.h" #include "fsfw/globalfunctions/Type.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
Type::Type() : Type::Type() :
actualType(UNKNOWN_TYPE) { actualType(UNKNOWN_TYPE) {

5
src/core/globalfunctions/arrayprinter.cpp

@ -1,5 +1,6 @@
#include "arrayprinter.h" #include "fsfw/globalfunctions/arrayprinter.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include <bitset> #include <bitset>

2
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) { void bitutil::bitSet(uint8_t *byte, uint8_t position) {
if(position > 7) { if(position > 7) {

4
src/core/globalfunctions/math/QuaternionOperations.cpp

@ -1,5 +1,5 @@
#include "QuaternionOperations.h" #include "fsfw/globalfunctions/math/QuaternionOperations.h"
#include "VectorOperations.h" #include "fsfw/globalfunctions/math/VectorOperations.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

2
src/core/globalfunctions/timevalOperations.cpp

@ -1,4 +1,4 @@
#include "timevalOperations.h" #include "fsfw/globalfunctions/timevalOperations.h"
timeval& operator+=(timeval& lhs, const timeval& rhs) { timeval& operator+=(timeval& lhs, const timeval& rhs) {
int64_t sum = lhs.tv_sec * 1000000. + lhs.tv_usec; int64_t sum = lhs.tv_sec * 1000000. + lhs.tv_usec;

5
src/core/health/HealthHelper.cpp

@ -1,5 +1,6 @@
#include "HealthHelper.h" #include "fsfw/health/HealthHelper.h"
#include "../serviceinterface/ServiceInterface.h"
#include "fsfw/serviceinterface/ServiceInterface.h"
HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) : HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) :
objectId(objectId), owner(owner) { objectId(objectId), owner(owner) {

2
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, void HealthMessage::setHealthMessage(CommandMessage* message, Command_t command,
HasHealthIF::HealthState health, HasHealthIF::HealthState oldHealth) { HasHealthIF::HealthState health, HasHealthIF::HealthState oldHealth) {

Some files were not shown because too many files have changed in this diff Show More