eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update framework #6

Merged
meierj merged 67 commits from mueller/master into eive/develop 2021-07-23 18:26:40 +02:00
Conversation 0 Commits 67 Files Changed 839 +304 -323
75 changed files with 304 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6de52e212 - Show all commits

6
inc/fsfw/datalinklayer/MapPacketExtraction.h
View File

@ -2,9 +2,9 @@
#define FSFW_DATALINKLAYER_MAPPACKETEXTRACTION_H_ #define FSFW_DATALINKLAYER_MAPPACKETEXTRACTION_H_
#include "MapPacketExtractionIF.h" #include "MapPacketExtractionIF.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../ipc/MessageQueueSenderIF.h" #include "fsfw/ipc/MessageQueueSenderIF.h"
class StorageManagerIF; class StorageManagerIF;

4
inc/fsfw/datalinklayer/TcTransferFrame.h
View File

@ -1,8 +1,8 @@
#ifndef TCTRANSFERFRAME_H_ #ifndef TCTRANSFERFRAME_H_
#define TCTRANSFERFRAME_H_ #define TCTRANSFERFRAME_H_
#include <stdint.h> #include <cstdint>
#include <stddef.h> #include <cstddef>
/** /**
* The TcTransferFrame class simplifies handling of such Frames. * The TcTransferFrame class simplifies handling of such Frames.

52
inc/fsfw/osal/InternalErrorCodes.h
View File

@ -1,39 +1,39 @@
#ifndef INTERNALERRORCODES_H_ #ifndef INTERNALERRORCODES_H_
#define INTERNALERRORCODES_H_ #define INTERNALERRORCODES_H_
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
class InternalErrorCodes { class InternalErrorCodes {
public: public:
static const uint8_t INTERFACE_ID = CLASS_ID::INTERNAL_ERROR_CODES; static const uint8_t INTERFACE_ID = CLASS_ID::INTERNAL_ERROR_CODES;
static const ReturnValue_t NO_CONFIGURATION_TABLE = MAKE_RETURN_CODE(0x01 ); static const ReturnValue_t NO_CONFIGURATION_TABLE = MAKE_RETURN_CODE(0x01 );
static const ReturnValue_t NO_CPU_TABLE = MAKE_RETURN_CODE(0x02 ); static const ReturnValue_t NO_CPU_TABLE = MAKE_RETURN_CODE(0x02 );
static const ReturnValue_t INVALID_WORKSPACE_ADDRESS = MAKE_RETURN_CODE(0x03 ); static const ReturnValue_t INVALID_WORKSPACE_ADDRESS = MAKE_RETURN_CODE(0x03 );
static const ReturnValue_t TOO_LITTLE_WORKSPACE = MAKE_RETURN_CODE(0x04 ); static const ReturnValue_t TOO_LITTLE_WORKSPACE = MAKE_RETURN_CODE(0x04 );
static const ReturnValue_t WORKSPACE_ALLOCATION = MAKE_RETURN_CODE(0x05 ); static const ReturnValue_t WORKSPACE_ALLOCATION = MAKE_RETURN_CODE(0x05 );
static const ReturnValue_t INTERRUPT_STACK_TOO_SMALL = MAKE_RETURN_CODE(0x06 ); static const ReturnValue_t INTERRUPT_STACK_TOO_SMALL = MAKE_RETURN_CODE(0x06 );
static const ReturnValue_t THREAD_EXITTED = MAKE_RETURN_CODE(0x07 ); static const ReturnValue_t THREAD_EXITTED = MAKE_RETURN_CODE(0x07 );
static const ReturnValue_t INCONSISTENT_MP_INFORMATION = MAKE_RETURN_CODE(0x08 ); static const ReturnValue_t INCONSISTENT_MP_INFORMATION = MAKE_RETURN_CODE(0x08 );
static const ReturnValue_t INVALID_NODE = MAKE_RETURN_CODE(0x09 ); static const ReturnValue_t INVALID_NODE = MAKE_RETURN_CODE(0x09 );
static const ReturnValue_t NO_MPCI = MAKE_RETURN_CODE(0x0a ); static const ReturnValue_t NO_MPCI = MAKE_RETURN_CODE(0x0a );
static const ReturnValue_t BAD_PACKET = MAKE_RETURN_CODE(0x0b ); static const ReturnValue_t BAD_PACKET = MAKE_RETURN_CODE(0x0b );
static const ReturnValue_t OUT_OF_PACKETS = MAKE_RETURN_CODE(0x0c ); static const ReturnValue_t OUT_OF_PACKETS = MAKE_RETURN_CODE(0x0c );
static const ReturnValue_t OUT_OF_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d ); static const ReturnValue_t OUT_OF_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d );
static const ReturnValue_t OUT_OF_PROXIES = MAKE_RETURN_CODE(0x0e ); static const ReturnValue_t OUT_OF_PROXIES = MAKE_RETURN_CODE(0x0e );
static const ReturnValue_t INVALID_GLOBAL_ID = MAKE_RETURN_CODE(0x0f ); static const ReturnValue_t INVALID_GLOBAL_ID = MAKE_RETURN_CODE(0x0f );
static const ReturnValue_t BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 ); static const ReturnValue_t BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 );
static const ReturnValue_t BAD_ATTRIBUTES = MAKE_RETURN_CODE(0x11 ); static const ReturnValue_t BAD_ATTRIBUTES = MAKE_RETURN_CODE(0x11 );
static const ReturnValue_t IMPLEMENTATION_KEY_CREATE_INCONSISTENCY = MAKE_RETURN_CODE(0x12 ); static const ReturnValue_t IMPLEMENTATION_KEY_CREATE_INCONSISTENCY = MAKE_RETURN_CODE(0x12 );
static const ReturnValue_t IMPLEMENTATION_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 ); static const ReturnValue_t IMPLEMENTATION_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 );
static const ReturnValue_t MUTEX_OBTAIN_FROM_BAD_STATE = MAKE_RETURN_CODE(0x14 ); static const ReturnValue_t MUTEX_OBTAIN_FROM_BAD_STATE = MAKE_RETURN_CODE(0x14 );
static const ReturnValue_t UNLIMITED_AND_MAXIMUM_IS_0 = MAKE_RETURN_CODE(0x15 ); static const ReturnValue_t UNLIMITED_AND_MAXIMUM_IS_0 = MAKE_RETURN_CODE(0x15 );
virtual ~InternalErrorCodes(); virtual ~InternalErrorCodes();
static ReturnValue_t translate(uint8_t code); static ReturnValue_t translate(uint8_t code);
private: private:
InternalErrorCodes(); InternalErrorCodes();
}; };
#endif /* INTERNALERRORCODES_H_ */ #endif /* INTERNALERRORCODES_H_ */

6
inc/fsfw/osal/linux/MessageQueue.h
View File

@ -1,9 +1,9 @@
#ifndef FSFW_OSAL_LINUX_MESSAGEQUEUE_H_ #ifndef FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
#define FSFW_OSAL_LINUX_MESSAGEQUEUE_H_ #define FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
#include "../../internalError/InternalErrorReporterIF.h" #include "fsfw/internalerror/InternalErrorReporterIF.h"
#include "../../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "../../ipc/MessageQueueMessage.h" #include "fsfw/ipc/MessageQueueMessage.h"
#include <mqueue.h> #include <mqueue.h>
/** /**

2
inc/fsfw/pus/CService200ModeCommanding.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_PUS_CSERVICE200MODECOMMANDING_H_ #ifndef FSFW_PUS_CSERVICE200MODECOMMANDING_H_
#define FSFW_PUS_CSERVICE200MODECOMMANDING_H_ #define FSFW_PUS_CSERVICE200MODECOMMANDING_H_
#include "../tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
/** /**
* @brief Custom PUS service to set mode of all objects implementing HasModesIF * @brief Custom PUS service to set mode of all objects implementing HasModesIF

4
inc/fsfw/pus/Service17Test.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_PUS_SERVICE17TEST_H_ #ifndef FSFW_PUS_SERVICE17TEST_H_
#define FSFW_PUS_SERVICE17TEST_H_ #define FSFW_PUS_SERVICE17TEST_H_
#include "../tmtcservices/PusServiceBase.h" #include "fsfw/tmtcservices/PusServiceBase.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
/** /**
* @brief Test Service * @brief Test Service

12
inc/fsfw/pus/Service1TelecommandVerification.h
View File

@ -1,12 +1,12 @@
#ifndef FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_ #ifndef FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_
#define FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_ #define FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_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 "../tmtcservices/AcceptsVerifyMessageIF.h" #include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
#include "../tmtcservices/PusVerificationReport.h" #include "fsfw/tmtcservices/PusVerificationReport.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
/** /**
* @brief Verify TC acceptance, start, progress and execution. * @brief Verify TC acceptance, start, progress and execution.

2
inc/fsfw/pus/Service20ParameterManagement.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_ #ifndef FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_
#define FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_ #define FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_
#include "../tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
/** /**
* @brief PUS Service 20 Parameter Service implementation * @brief PUS Service 20 Parameter Service implementation

6
inc/fsfw/pus/Service2DeviceAccess.h
View File

@ -1,9 +1,9 @@
#ifndef FSFW_PUS_SERVICE2DEVICEACCESS_H_ #ifndef FSFW_PUS_SERVICE2DEVICEACCESS_H_
#define FSFW_PUS_SERVICE2DEVICEACCESS_H_ #define FSFW_PUS_SERVICE2DEVICEACCESS_H_
#include "../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
#include "../devicehandlers/AcceptsDeviceResponsesIF.h" #include "fsfw/devicehandlers/AcceptsDeviceResponsesIF.h"
#include "../tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
/** /**
* @brief Raw Commanding and Wiretapping of devices. * @brief Raw Commanding and Wiretapping of devices.

6
inc/fsfw/pus/Service3Housekeeping.h
View File

@ -1,9 +1,9 @@
#ifndef FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_ #ifndef FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_
#define FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_ #define FSFW_PUS_SERVICE3HOUSEKEEPINGSERVICE_H_
#include "../housekeeping/AcceptsHkPacketsIF.h" #include "fsfw/housekeeping/AcceptsHkPacketsIF.h"
#include "../housekeeping/HousekeepingMessage.h" #include "fsfw/housekeeping/HousekeepingMessage.h"
#include "../tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
/** /**
* @brief Manges spacecraft housekeeping reports and * @brief Manges spacecraft housekeeping reports and

4
inc/fsfw/pus/Service5EventReporting.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_PUS_SERVICE5EVENTREPORTING_H_ #ifndef FSFW_PUS_SERVICE5EVENTREPORTING_H_
#define FSFW_PUS_SERVICE5EVENTREPORTING_H_ #define FSFW_PUS_SERVICE5EVENTREPORTING_H_
#include "../tmtcservices/PusServiceBase.h" #include "fsfw/tmtcservices/PusServiceBase.h"
#include "../events/EventMessage.h" #include "fsfw/events/EventMessage.h"
/** /**
* @brief Report on-board events like information or errors * @brief Report on-board events like information or errors

4
inc/fsfw/pus/Service8FunctionManagement.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_ #ifndef FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
#define FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_ #define FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
#include "../action/ActionMessage.h" #include "fsfw/action/ActionMessage.h"
#include "../tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
/** /**
* @brief Functional commanding. * @brief Functional commanding.

2
inc/fsfw/pus/Service9TimeManagement.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_ #ifndef FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_
#define FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_ #define FSFW_PUS_SERVICE9TIMEMANAGEMENT_H_
#include "../tmtcservices/PusServiceBase.h" #include "fsfw/tmtcservices/PusServiceBase.h"
class Service9TimeManagement: public PusServiceBase { class Service9TimeManagement: public PusServiceBase {
public: public:

4
inc/fsfw/rmap/RMAP.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_RMAP_RMAP_H_ #ifndef FSFW_RMAP_RMAP_H_
#define FSFW_RMAP_RMAP_H_ #define FSFW_RMAP_RMAP_H_
#include "../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../rmap/RMAPCookie.h" #include "fsfw/rmap/RMAPCookie.h"
//SHOULDTODO: clean up includes for RMAP, should be enough to include RMAP.h but right now it's quite chaotic... //SHOULDTODO: clean up includes for RMAP, should be enough to include RMAP.h but right now it's quite chaotic...

2
inc/fsfw/rmap/RMAPCookie.h
View File

@ -2,7 +2,7 @@
#define FSFW_RMAP_RMAPCOOKIE_H_ #define FSFW_RMAP_RMAPCOOKIE_H_
#include "rmapStructs.h" #include "rmapStructs.h"
#include "../devicehandlers/CookieIF.h" #include "fsfw/devicehandlers/CookieIF.h"
#include <cstddef> #include <cstddef>
class RMAPChannelIF; class RMAPChannelIF;

2
inc/fsfw/rmap/RmapDeviceCommunicationIF.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_ #ifndef FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_
#define FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_ #define FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_
#include "../devicehandlers/DeviceCommunicationIF.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
/** /**
* @brief This class is a implementation of a DeviceCommunicationIF for RMAP calls. * @brief This class is a implementation of a DeviceCommunicationIF for RMAP calls.

2
inc/fsfw/thermal/ThermalComponentCore.h
View File

@ -6,7 +6,7 @@
#include "AbstractTemperatureSensor.h" #include "AbstractTemperatureSensor.h"
#include "ThermalModule.h" #include "ThermalModule.h"
#include "../datapoollocal/LocalPoolVariable.h" #include "fsfw/datapoollocal/LocalPoolVariable.h"
/** /**
* @brief * @brief

12
inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h
View File

@ -1,7 +1,8 @@
#ifndef FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ #ifndef FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#define FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ #define FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../../returnvalues/HasReturnvaluesIF.h"
class TmPacketMinimal; class TmPacketMinimal;
class PacketTimestampInterpreterIF { class PacketTimestampInterpreterIF {
@ -9,9 +10,10 @@ public:
virtual ~PacketTimestampInterpreterIF() {} virtual ~PacketTimestampInterpreterIF() {}
virtual ReturnValue_t getPacketTime(TmPacketMinimal* packet, virtual ReturnValue_t getPacketTime(TmPacketMinimal* packet,
timeval* timestamp) const = 0; timeval* timestamp) const = 0;
virtual ReturnValue_t getPacketTimeRaw(TmPacketMinimal* packet, const uint8_t** timePtr, uint32_t* size) const = 0; virtual ReturnValue_t getPacketTimeRaw(TmPacketMinimal* packet, const uint8_t** timePtr,
uint32_t* size) const = 0;
}; };
#endif /* FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ */ #endif /* FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_ */

12
inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h
View File

@ -1,13 +1,15 @@
#ifndef TMTCPACKET_PUS_TMPACKETBASE_H_ #ifndef TMTCPACKET_PUS_TMPACKETBASE_H_
#define TMTCPACKET_PUS_TMPACKETBASE_H_ #define TMTCPACKET_PUS_TMPACKETBASE_H_
#include "../../SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "../../../timemanager/TimeStamperIF.h" #include "fsfw/timemanager/TimeStamperIF.h"
#include "../../../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include "../../../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
namespace Factory {
namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();
} }

8
inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h
View File

@ -2,10 +2,10 @@
#define FSFW_TMTCPACKET_PUS_TMPACKETPUSA_H_ #define FSFW_TMTCPACKET_PUS_TMPACKETPUSA_H_
#include "TmPacketBase.h" #include "TmPacketBase.h"
#include "../../SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "../../../timemanager/TimeStamperIF.h" #include "fsfw/timemanager/TimeStamperIF.h"
#include "../../../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include "../../../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();

8
inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h
View File

@ -2,10 +2,10 @@
#define FSFW_TMTCPACKET_PUS_TMPACKETPUSC_H_ #define FSFW_TMTCPACKET_PUS_TMPACKETPUSC_H_
#include "TmPacketBase.h" #include "TmPacketBase.h"
#include "../../SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "../../../timemanager/TimeStamperIF.h" #include "fsfw/timemanager/TimeStamperIF.h"
#include "../../../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include "../../../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();

12
inc/fsfw/tmtcservices/TmTcBridge.h
View File

@ -4,12 +4,12 @@
#include "AcceptsTelemetryIF.h" #include "AcceptsTelemetryIF.h"
#include "AcceptsTelecommandsIF.h" #include "AcceptsTelecommandsIF.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"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../container/DynamicFIFO.h" #include "fsfw/container/DynamicFIFO.h"
#include "../tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
class TmTcBridge : public AcceptsTelemetryIF, class TmTcBridge : public AcceptsTelemetryIF,
public AcceptsTelecommandsIF, public AcceptsTelecommandsIF,

4
inc/fsfw/tmtcservices/TmTcMessage.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_TMTCSERVICES_TMTCMESSAGE_H_ #ifndef FSFW_TMTCSERVICES_TMTCMESSAGE_H_
#define FSFW_TMTCSERVICES_TMTCMESSAGE_H_ #define FSFW_TMTCSERVICES_TMTCMESSAGE_H_
#include "../ipc/MessageQueueMessage.h" #include "fsfw/ipc/MessageQueueMessage.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
/** /**
* @brief This message class is used to pass Telecommand and Telemetry * @brief This message class is used to pass Telecommand and Telemetry
* packets between tasks. * packets between tasks.

2
inc/fsfw/tmtcservices/VerificationReporter.h
View File

@ -2,7 +2,7 @@
#define FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_ #define FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
#include "PusVerificationReport.h" #include "PusVerificationReport.h"
#include "../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();

4
src/core/thermal/ThermalComponentCore.cpp
View File

@ -1,5 +1,5 @@
#include "ThermalComponentCore.h" #include "fsfw/thermal/ThermalComponentCore.h"
#include "tcsDefinitions.h" #include "fsfw/thermal/tcsDefinitions.h"
ThermalComponentCore::ThermalComponentCore(object_id_t reportingObjectId, ThermalComponentCore::ThermalComponentCore(object_id_t reportingObjectId,
uint8_t domainId, gp_id_t temperaturePoolId, uint8_t domainId, gp_id_t temperaturePoolId,

6
src/core/thermal/ThermalMonitorReporter.cpp
View File

@ -1,7 +1,7 @@
#include "ThermalMonitorReporter.h" #include "fsfw/thermal/ThermalMonitorReporter.h"
#include "ThermalComponentIF.h" #include "fsfw/thermal/ThermalComponentIF.h"
#include "../monitoring/MonitoringIF.h" #include "fsfw/monitoring/MonitoringIF.h"
ThermalMonitorReporter::~ThermalMonitorReporter() { ThermalMonitorReporter::~ThermalMonitorReporter() {
} }

2
src/core/timemanager/TimeMessage.cpp
View File

@ -1,4 +1,4 @@
#include "TimeMessage.h" #include "fsfw/timemanager/TimeMessage.h"
TimeMessage::TimeMessage() { TimeMessage::TimeMessage() {
this->messageSize += sizeof(timeval) + sizeof(uint32_t); this->messageSize += sizeof(timeval) + sizeof(uint32_t);

5
src/core/timemanager/TimeStamper.cpp
View File

@ -1,5 +1,6 @@
#include "TimeStamper.h" #include "fsfw/timemanager/TimeStamper.h"
#include "Clock.h" #include "fsfw/timemanager/Clock.h"
#include <cstring> #include <cstring>
TimeStamper::TimeStamper(object_id_t objectId): SystemObject(objectId) {} TimeStamper::TimeStamper(object_id_t objectId): SystemObject(objectId) {}

4
src/core/tmtcpacket/pus/tc/TcPacketPus.cpp
View File

@ -1,5 +1,5 @@
#include "TcPacketPus.h" #include "fsfw/tmtcpacket/pus/tc/TcPacketPus.h"
#include "../../../globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include <cstring> #include <cstring>

8
src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp
View File

@ -1,8 +1,8 @@
#include "TcPacketStoredBase.h" #include "fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h"
#include "../../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../objectmanager/frameworkObjects.h" #include "fsfw/objectmanager/frameworkObjects.h"
#include <cstring> #include <cstring>

12
src/core/tmtcpacket/pus/tm/TmPacketBase.cpp
View File

@ -1,10 +1,10 @@
#include "TmPacketBase.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"
#include "../../../globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "../../../globalfunctions/arrayprinter.h" #include "fsfw/globalfunctions/arrayprinter.h"
#include "../../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../timemanager/CCSDSTime.h" #include "fsfw/timemanager/CCSDSTime.h"
#include <cstring> #include <cstring>

4
src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp
View File

@ -1,5 +1,5 @@
#include "TmPacketMinimal.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h"
#include "../PacketTimestampInterpreterIF.h" #include "fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h"
#include <cstddef> #include <cstddef>
#include <ctime> #include <ctime>

14
src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp
View File

@ -1,11 +1,11 @@
#include "TmPacketPusA.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketPusA.h"
#include "TmPacketBase.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"
#include "../../../globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "../../../globalfunctions/arrayprinter.h" #include "fsfw/globalfunctions/arrayprinter.h"
#include "../../../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../../../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../timemanager/CCSDSTime.h" #include "fsfw/timemanager/CCSDSTime.h"
#include <cstring> #include <cstring>

14
src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp
View File

@ -1,11 +1,11 @@
#include "TmPacketPusC.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketPusC.h"
#include "TmPacketBase.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketBase.h"
#include "../../../globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "../../../globalfunctions/arrayprinter.h" #include "fsfw/globalfunctions/arrayprinter.h"
#include "../../../objectmanager/ObjectManagerIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h"
#include "../../../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../timemanager/CCSDSTime.h" #include "fsfw/timemanager/CCSDSTime.h"
#include <cstring> #include <cstring>

8
src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp
View File

@ -1,8 +1,8 @@
#include "TmPacketStoredBase.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h"
#include "../../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include <cstring> #include <cstring>

6
src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp
View File

@ -1,7 +1,7 @@
#include "TmPacketStoredPusA.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h"
#include "../../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../../tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include <cstring> #include <cstring>

10
src/core/tmtcservices/TmTcBridge.cpp
View File

@ -1,9 +1,9 @@
#include "TmTcBridge.h" #include "fsfw/tmtcservices/TmTcBridge.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../globalfunctions/arrayprinter.h" #include "fsfw/globalfunctions/arrayprinter.h"
#define TMTCBRIDGE_WIRETAPPING 0 #define TMTCBRIDGE_WIRETAPPING 0

2
src/core/tmtcservices/TmTcMessage.cpp
View File

@ -1,4 +1,4 @@
#include "TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include <cstring> #include <cstring>

14
src/core/tmtcservices/VerificationReporter.cpp
View File

@ -1,11 +1,11 @@
#include "VerificationReporter.h" #include "fsfw/tmtcservices/VerificationReporter.h"
#include "AcceptsVerifyMessageIF.h" #include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
#include "PusVerificationReport.h" #include "fsfw/tmtcservices/PusVerificationReport.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/frameworkObjects.h" #include "fsfw/objectmanager/frameworkObjects.h"
object_id_t VerificationReporter::messageReceiver = object_id_t VerificationReporter::messageReceiver =
objects::PUS_SERVICE_1_VERIFICATION; objects::PUS_SERVICE_1_VERIFICATION;

16
src/opt/datalinklayer/Farm1StateWait.cpp
View File

@ -1,15 +1,7 @@
/** #include "fsfw/datalinklayer/ClcwIF.h"
* @file Farm1StateWait.cpp #include "fsfw/datalinklayer/Farm1StateWait.h"
* @brief This file defines the Farm1StateWait class. #include "fsfw/datalinklayer/TcTransferFrame.h"
* @date 24.04.2013 #include "fsfw/datalinklayer/VirtualChannelReception.h"
* @author baetz
*/
#include "ClcwIF.h"
#include "Farm1StateWait.h"
#include "TcTransferFrame.h"
#include "VirtualChannelReception.h"
Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

16
src/opt/datalinklayer/MapPacketExtraction.cpp
View File

@ -1,12 +1,12 @@
#include "MapPacketExtraction.h" #include "fsfw/datalinklayer/MapPacketExtraction.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../tmtcpacket/SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "../tmtcservices/AcceptsTelecommandsIF.h" #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
#include "../tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include <cstring> #include <cstring>

15
src/opt/datalinklayer/TcTransferFrame.cpp
View File

@ -1,17 +1,8 @@
/** #include "fsfw/datalinklayer/TcTransferFrame.h"
* @file TcTransferFrame.cpp #include "fsfw/serviceinterface/ServiceInterface.h"
* @brief This file defines the TcTransferFrame class.
* @date 27.04.2013
* @author baetz
*/
#include "TcTransferFrame.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
TcTransferFrame::TcTransferFrame() { TcTransferFrame::TcTransferFrame() {
frame = NULL; frame = nullptr;
} }
TcTransferFrame::TcTransferFrame(uint8_t* setData) { TcTransferFrame::TcTransferFrame(uint8_t* setData) {

16
src/opt/datalinklayer/TcTransferFrameLocal.cpp
View File

@ -1,14 +1,8 @@
/** #include "fsfw/datalinklayer/TcTransferFrameLocal.h"
* @file TcTransferFrameLocal.cpp #include "fsfw/globalfunctions/CRC.h"
* @brief This file defines the TcTransferFrameLocal class. #include "fsfw/serviceinterface/ServiceInterface.h"
* @date 27.04.2013
* @author baetz
*/
#include "TcTransferFrameLocal.h" #include <cstring>
#include "../globalfunctions/CRC.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include <string.h>
TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid, TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,
uint8_t vcId, uint8_t sequenceNumber, uint8_t setSegmentHeader, uint8_t* data, uint16_t dataSize, uint16_t forceCrc) { uint8_t vcId, uint8_t sequenceNumber, uint8_t setSegmentHeader, uint8_t* data, uint16_t dataSize, uint16_t forceCrc) {
@ -38,7 +32,7 @@ TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uin
this->getFullFrame()[getFullSize()-1] = (crc & 0x00FF); this->getFullFrame()[getFullSize()-1] = (crc & 0x00FF);
} else { } else {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::debug << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl; sif::warning << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl;
#endif #endif
} }
} else { } else {

6
src/opt/datalinklayer/VirtualChannelReception.cpp
View File

@ -5,9 +5,9 @@
* @author baetz * @author baetz
*/ */
#include "BCFrame.h" #include "fsfw/datalinklayer/BCFrame.h"
#include "VirtualChannelReception.h" #include "fsfw/datalinklayer/VirtualChannelReception.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId, VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
uint8_t setSlidingWindowWidth) : uint8_t setSlidingWindowWidth) :

10
src/opt/monitoring/LimitViolationReporter.cpp
View File

@ -1,9 +1,9 @@
#include "LimitViolationReporter.h" #include "fsfw/monitoring/LimitViolationReporter.h"
#include "MonitoringIF.h" #include "fsfw/monitoring/MonitoringIF.h"
#include "ReceivesMonitoringReportsIF.h" #include "fsfw/monitoring/ReceivesMonitoringReportsIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF* data) { ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF* data) {
ReturnValue_t result = checkClassLoaded(); ReturnValue_t result = checkClassLoaded();

4
src/opt/monitoring/MonitoringMessage.cpp
View File

@ -1,5 +1,5 @@
#include "MonitoringMessage.h" #include "fsfw/monitoring/MonitoringMessage.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
MonitoringMessage::~MonitoringMessage() { MonitoringMessage::~MonitoringMessage() {
} }

14
src/opt/pus/CService200ModeCommanding.cpp
View File

@ -1,11 +1,11 @@
#include "CService200ModeCommanding.h" #include "fsfw/pus/CService200ModeCommanding.h"
#include "servicepackets/Service200Packets.h" #include "fsfw/pus/servicepackets/Service200Packets.h"
#include "../modes/HasModesIF.h" #include "fsfw/modes/HasModesIF.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../serialize/SerialLinkedListAdapter.h" #include "fsfw/serialize/SerialLinkedListAdapter.h"
#include "../modes/ModeMessage.h" #include "fsfw/modes/ModeMessage.h"
CService200ModeCommanding::CService200ModeCommanding(object_id_t objectId, CService200ModeCommanding::CService200ModeCommanding(object_id_t objectId,
uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands, uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands,

12
src/opt/pus/CService201HealthCommanding.cpp
View File

@ -1,10 +1,10 @@
#include "CService201HealthCommanding.h" #include "fsfw/pus/CService201HealthCommanding.h"
#include "servicepackets/Service201Packets.h" #include "fsfw/pus/servicepackets/Service201Packets.h"
#include "../health/HasHealthIF.h" #include "fsfw/health/HasHealthIF.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../health/HealthMessage.h" #include "fsfw/health/HealthMessage.h"
CService201HealthCommanding::CService201HealthCommanding(object_id_t objectId, CService201HealthCommanding::CService201HealthCommanding(object_id_t objectId,

10
src/opt/pus/Service17Test.cpp
View File

@ -1,9 +1,9 @@
#include "Service17Test.h" #include "fsfw/FSFW.h"
#include <FSFWConfig.h> #include "fsfw/pus/Service17Test.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "../tmtcpacket/pus/tm/TmPacketStored.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"
Service17Test::Service17Test(object_id_t objectId, Service17Test::Service17Test(object_id_t objectId,

16
src/opt/pus/Service1TelecommandVerification.cpp
View File

@ -1,12 +1,12 @@
#include "Service1TelecommandVerification.h" #include "fsfw/pus/Service1TelecommandVerification.h"
#include "servicepackets/Service1Packets.h" #include "fsfw/pus/servicepackets/Service1Packets.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../tmtcservices/PusVerificationReport.h" #include "fsfw/tmtcservices/PusVerificationReport.h"
#include "../tmtcpacket/pus/tm/TmPacketStored.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../tmtcservices/AcceptsTelemetryIF.h" #include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
Service1TelecommandVerification::Service1TelecommandVerification( Service1TelecommandVerification::Service1TelecommandVerification(
object_id_t objectId, uint16_t apid, uint8_t serviceId, object_id_t objectId, uint16_t apid, uint8_t serviceId,

14
src/opt/pus/Service20ParameterManagement.cpp
View File

@ -1,11 +1,11 @@
#include "Service20ParameterManagement.h" #include "fsfw/pus/Service20ParameterManagement.h"
#include "servicepackets/Service20Packets.h" #include "fsfw/pus/servicepackets/Service20Packets.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../parameters/HasParametersIF.h" #include "fsfw/parameters/HasParametersIF.h"
#include "../parameters/ParameterMessage.h" #include "fsfw/parameters/ParameterMessage.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../parameters/ReceivesParameterMessagesIF.h" #include "fsfw/parameters/ReceivesParameterMessagesIF.h"
Service20ParameterManagement::Service20ParameterManagement(object_id_t objectId, uint16_t apid, Service20ParameterManagement::Service20ParameterManagement(object_id_t objectId, uint16_t apid,

22
src/opt/pus/Service2DeviceAccess.cpp
View File

@ -1,15 +1,15 @@
#include "Service2DeviceAccess.h" #include "fsfw/pus/Service2DeviceAccess.h"
#include "servicepackets/Service2Packets.h" #include "fsfw/pus/servicepackets/Service2Packets.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../devicehandlers/DeviceHandlerIF.h" #include "fsfw/devicehandlers/DeviceHandlerIF.h"
#include "../storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "../devicehandlers/DeviceHandlerMessage.h" #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
#include "../serialize/EndianConverter.h" #include "fsfw/serialize/EndianConverter.h"
#include "../action/ActionMessage.h" #include "fsfw/action/ActionMessage.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
#include "../serialize/SerialLinkedListAdapter.h" #include "fsfw/serialize/SerialLinkedListAdapter.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
Service2DeviceAccess::Service2DeviceAccess(object_id_t objectId, Service2DeviceAccess::Service2DeviceAccess(object_id_t objectId,
uint16_t apid, uint8_t serviceId, uint8_t numberOfParallelCommands, uint16_t apid, uint8_t serviceId, uint8_t numberOfParallelCommands,

8
src/opt/pus/Service3Housekeeping.cpp
View File

@ -1,8 +1,8 @@
#include "Service3Housekeeping.h" #include "fsfw/pus/Service3Housekeeping.h"
#include "servicepackets/Service3Packets.h" #include "fsfw/pus/servicepackets/Service3Packets.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../datapoollocal/HasLocalDataPoolIF.h" #include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
Service3Housekeeping::Service3Housekeeping(object_id_t objectId, uint16_t apid, Service3Housekeeping::Service3Housekeeping(object_id_t objectId, uint16_t apid,
uint8_t serviceId): uint8_t serviceId):

14
src/opt/pus/Service5EventReporting.cpp
View File

@ -1,11 +1,11 @@
#include "Service5EventReporting.h" #include "fsfw/pus/Service5EventReporting.h"
#include "servicepackets/Service5Packets.h" #include "fsfw/pus/servicepackets/Service5Packets.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../events/EventManagerIF.h" #include "fsfw/events/EventManagerIF.h"
#include "../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "../tmtcpacket/pus/tm/TmPacketStored.h" #include "fsfw/tmtcpacket/pus/tm/TmPacketStored.h"
Service5EventReporting::Service5EventReporting(object_id_t objectId, Service5EventReporting::Service5EventReporting(object_id_t objectId,

16
src/opt/pus/Service8FunctionManagement.cpp
View File

@ -1,12 +1,12 @@
#include "Service8FunctionManagement.h" #include "fsfw/pus/Service8FunctionManagement.h"
#include "servicepackets/Service8Packets.h" #include "fsfw/pus/servicepackets/Service8Packets.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../objectmanager/SystemObjectIF.h" #include "fsfw/objectmanager/SystemObjectIF.h"
#include "../action/HasActionsIF.h" #include "fsfw/action/HasActionsIF.h"
#include "../devicehandlers/DeviceHandlerIF.h" #include "fsfw/devicehandlers/DeviceHandlerIF.h"
#include "../serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
Service8FunctionManagement::Service8FunctionManagement(object_id_t objectId, Service8FunctionManagement::Service8FunctionManagement(object_id_t objectId,
uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands, uint16_t apid, uint8_t serviceId, uint8_t numParallelCommands,

10
src/opt/pus/Service9TimeManagement.cpp
View File

@ -1,9 +1,9 @@
#include "Service9TimeManagement.h" #include "fsfw/pus/Service9TimeManagement.h"
#include "servicepackets/Service9Packets.h" #include "fsfw/pus/servicepackets/Service9Packets.h"
#include "../timemanager/CCSDSTime.h" #include "fsfw/timemanager/CCSDSTime.h"
#include "../events/EventManagerIF.h" #include "fsfw/events/EventManagerIF.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
Service9TimeManagement::Service9TimeManagement(object_id_t objectId, Service9TimeManagement::Service9TimeManagement(object_id_t objectId,

8
src/opt/rmap/RMAP.cpp
View File

@ -1,8 +1,8 @@
#include "RMAP.h" #include "fsfw/rmap/RMAP.h"
#include "rmapStructs.h" #include "fsfw/rmap/rmapStructs.h"
#include "RMAPChannelIF.h" #include "fsfw/rmap/RMAPChannelIF.h"
#include "../devicehandlers/DeviceCommunicationIF.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
#include <cstddef> #include <cstddef>

5
src/opt/rmap/RMAPCookie.cpp
View File

@ -1,5 +1,6 @@
#include "RMAPChannelIF.h" #include "fsfw/rmap/RMAPChannelIF.h"
#include "RMAPCookie.h" #include "fsfw/rmap/RMAPCookie.h"
#include <cstddef> #include <cstddef>

4
src/opt/rmap/RmapDeviceCommunicationIF.cpp
View File

@ -1,5 +1,5 @@
#include "RmapDeviceCommunicationIF.h" #include "fsfw/rmap/RmapDeviceCommunicationIF.h"
#include "RMAP.h" #include "fsfw/rmap/RMAP.h"
//TODO Cast here are all potential bugs //TODO Cast here are all potential bugs
RmapDeviceCommunicationIF::~RmapDeviceCommunicationIF() { RmapDeviceCommunicationIF::~RmapDeviceCommunicationIF() {

4
src/opt/tmstorage/TmStoreMessage.cpp
View File

@ -1,5 +1,5 @@
#include "TmStoreMessage.h" #include "fsfw/tmstorage/TmStoreMessage.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
TmStoreMessage::~TmStoreMessage() { TmStoreMessage::~TmStoreMessage() {

7
src/osal/common/tcpipCommon.cpp
View File

@ -1,7 +1,8 @@
#include "tcpipCommon.h" #include "fsfw/platform.h"
#include <fsfw/serviceinterface/ServiceInterface.h> #include "fsfw/osal/common/tcpipCommon.h"
#include "fsfw/serviceinterface/ServiceInterface.h"
#ifdef _WIN32 #ifdef PLATFORM_WIN
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

4
src/osal/freertos/MessageQueue.cpp
View File

@ -1,7 +1,7 @@
#include "MessageQueue.h" #include "MessageQueue.h"
#include "QueueMapManager.h" #include "QueueMapManager.h"
#include "../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize): MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize):
maxMessageSize(maxMessageSize) { maxMessageSize(maxMessageSize) {

10
src/osal/linux/BinarySemaphore.cpp
View File

@ -1,11 +1,11 @@
#include "BinarySemaphore.h" #include "fsfw/osal/linux/BinarySemaphore.h"
#include "unixUtility.h" #include "fsfw/osal/linux/unixUtility.h"
#include "../../serviceinterface/ServiceInterfacePrinter.h" #include "fsfw/serviceinterface/ServiceInterfacePrinter.h"
#include "../../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <cstring>
BinarySemaphore::BinarySemaphore() { BinarySemaphore::BinarySemaphore() {

4
src/osal/linux/Clock.cpp
View File

@ -1,5 +1,5 @@
#include "../../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include <sys/time.h> #include <sys/time.h>
#include <sys/sysinfo.h> #include <sys/sysinfo.h>

6
src/osal/linux/CountingSemaphore.cpp
View File

@ -1,7 +1,7 @@
#include "CountingSemaphore.h" #include "fsfw/osal/linux/CountingSemaphore.h"
#include "unixUtility.h" #include "fsfw/osal/linux/unixUtility.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include <errno.h> #include <errno.h>

6
src/osal/linux/FixedTimeslotTask.cpp
View File

@ -1,7 +1,7 @@
#include "FixedTimeslotTask.h" #include "fsfw/osal/linux/FixedTimeslotTask.h"
#include "../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include <limits.h> #include <limits.h>

2
src/osal/linux/InternalErrorCodes.cpp
View File

@ -1,4 +1,4 @@
#include "../../osal/InternalErrorCodes.h" #include "fsfw/osal/InternalErrorCodes.h"
ReturnValue_t InternalErrorCodes::translate(uint8_t code) { ReturnValue_t InternalErrorCodes::translate(uint8_t code) {
//TODO This class can be removed //TODO This class can be removed

8
src/osal/linux/MessageQueue.cpp
View File

@ -1,8 +1,8 @@
#include "MessageQueue.h" #include "fsfw/osal/linux/MessageQueue.h"
#include "unixUtility.h" #include "fsfw/osal/linux/unixUtility.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include <fstream> #include <fstream>

8
src/osal/linux/Mutex.cpp
View File

@ -1,8 +1,8 @@
#include "Mutex.h" #include "fsfw/osal/linux/Mutex.h"
#include "unixUtility.h" #include "fsfw/osal/linux/unixUtility.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include <cstring> #include <cstring>
#include <errno.h> #include <errno.h>

4
src/osal/linux/MutexFactory.cpp
View File

@ -1,6 +1,6 @@
#include "Mutex.h" #include "fsfw/osal/linux/Mutex.h"
#include "../../ipc/MutexFactory.h" #include "fsfw/ipc/MutexFactory.h"
//TODO: Different variant than the lazy loading in QueueFactory. What's better and why? //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
MutexFactory* MutexFactory::factoryInstance = new MutexFactory(); MutexFactory* MutexFactory::factoryInstance = new MutexFactory();

10
src/osal/linux/QueueFactory.cpp
View File

@ -1,14 +1,12 @@
#include "../../ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "MessageQueue.h" #include "fsfw/osal/linux/MessageQueue.h"
#include "../../ipc/messageQueueDefinitions.h" #include "fsfw/ipc/messageQueueDefinitions.h"
#include "../../ipc/MessageQueueSenderIF.h" #include "fsfw/ipc/MessageQueueSenderIF.h"
#include "../../serviceinterface/ServiceInterfaceStream.h"
#include <mqueue.h> #include <mqueue.h>
#include <errno.h> #include <errno.h>
#include <cstring> #include <cstring>
QueueFactory* QueueFactory::factoryInstance = nullptr; QueueFactory* QueueFactory::factoryInstance = nullptr;

7
src/osal/linux/SemaphoreFactory.cpp
View File

@ -1,8 +1,7 @@
#include "BinarySemaphore.h" #include "fsfw/osal/linux/BinarySemaphore.h"
#include "CountingSemaphore.h" #include "fsfw/osal/linux/CountingSemaphore.h"
#include "../../tasks/SemaphoreFactory.h" #include "fsfw/tasks/SemaphoreFactory.h"
#include "../../serviceinterface/ServiceInterfaceStream.h"
SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr; SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;

10
src/osal/linux/TaskFactory.cpp
View File

@ -1,9 +1,9 @@
#include "FixedTimeslotTask.h" #include "fsfw/osal/linux/FixedTimeslotTask.h"
#include "PeriodicPosixTask.h" #include "fsfw/osal/linux/PeriodicPosixTask.h"
#include "../../tasks/TaskFactory.h" #include "fsfw/tasks/TaskFactory.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
//TODO: Different variant than the lazy loading in QueueFactory. What's better and why? //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
TaskFactory* TaskFactory::factoryInstance = new TaskFactory(); TaskFactory* TaskFactory::factoryInstance = new TaskFactory();

4
src/osal/linux/Timer.cpp
View File

@ -1,5 +1,5 @@
#include "Timer.h" #include "fsfw/osal/linux/Timer.h"
#include "../../serviceinterface/ServiceInterfaceStream.h" #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include <errno.h> #include <errno.h>

6
src/osal/linux/tcpipHelpers.cpp
View File

@ -1,7 +1,7 @@
#include "../common/tcpipHelpers.h" #include "fsfw/osal/common/tcpipHelpers.h"
#include "../../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "../../tasks/TaskFactory.h" #include "fsfw/tasks/TaskFactory.h"
#include <errno.h> #include <errno.h>
#include <string> #include <string>