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

more include replacements

Browse Source
This commit is contained in:
Robin Müller
2021-07-13 20:58:45 +02:00
parent 936d0e9f0c
commit a6de52e212
75 changed files with 304 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -1,39 +1,39 @@
#ifndef INTERNALERRORCODES_H_
#define INTERNALERRORCODES_H_
#include "../returnvalues/HasReturnvaluesIF.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
class InternalErrorCodes {
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_CPU_TABLE = MAKE_RETURN_CODE(0x02 );
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 WORKSPACE_ALLOCATION = MAKE_RETURN_CODE(0x05 );
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 INCONSISTENT_MP_INFORMATION = MAKE_RETURN_CODE(0x08 );
static const ReturnValue_t INVALID_NODE = MAKE_RETURN_CODE(0x09 );
static const ReturnValue_t NO_MPCI = MAKE_RETURN_CODE(0x0a );
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_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d );
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 BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 );
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_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 );
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 NO_CONFIGURATION_TABLE = MAKE_RETURN_CODE(0x01 );
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 TOO_LITTLE_WORKSPACE = MAKE_RETURN_CODE(0x04 );
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 THREAD_EXITTED = MAKE_RETURN_CODE(0x07 );
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 NO_MPCI = MAKE_RETURN_CODE(0x0a );
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_GLOBAL_OBJECTS = MAKE_RETURN_CODE(0x0d );
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 BAD_STACK_HOOK = MAKE_RETURN_CODE(0x10 );
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_BLOCKING_OPERATION_CANCEL = MAKE_RETURN_CODE(0x13 );
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 );
virtual ~InternalErrorCodes();
virtual ~InternalErrorCodes();
static ReturnValue_t translate(uint8_t code);
static ReturnValue_t translate(uint8_t code);
private:
InternalErrorCodes();
InternalErrorCodes();
};
#endif /* INTERNALERRORCODES_H_ */

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

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

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

@ -1,7 +1,7 @@
#ifndef 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

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

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

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

@ -1,12 +1,12 @@
#ifndef FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_
#define FSFW_PUS_SERVICE1TELECOMMANDVERIFICATION_H_
#include "../objectmanager/SystemObject.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../tasks/ExecutableObjectIF.h"
#include "../tmtcservices/AcceptsVerifyMessageIF.h"
#include "../tmtcservices/PusVerificationReport.h"
#include "../ipc/MessageQueueIF.h"
#include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "fsfw/tasks/ExecutableObjectIF.h"
#include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
#include "fsfw/tmtcservices/PusVerificationReport.h"
#include "fsfw/ipc/MessageQueueIF.h"
/**
* @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_
#define FSFW_PUS_SERVICE20PARAMETERMANAGEMENT_H_
#include "../tmtcservices/CommandingServiceBase.h"
#include "fsfw/tmtcservices/CommandingServiceBase.h"
/**
* @brief PUS Service 20 Parameter Service implementation

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

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

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

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

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

@ -1,8 +1,8 @@
#ifndef FSFW_PUS_SERVICE5EVENTREPORTING_H_
#define FSFW_PUS_SERVICE5EVENTREPORTING_H_
#include "../tmtcservices/PusServiceBase.h"
#include "../events/EventMessage.h"
#include "fsfw/tmtcservices/PusServiceBase.h"
#include "fsfw/events/EventMessage.h"
/**
* @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_
#define FSFW_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
#include "../action/ActionMessage.h"
#include "../tmtcservices/CommandingServiceBase.h"
#include "fsfw/action/ActionMessage.h"
#include "fsfw/tmtcservices/CommandingServiceBase.h"
/**
* @brief Functional commanding.

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

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

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

@ -1,8 +1,8 @@
#ifndef FSFW_RMAP_RMAP_H_
#define FSFW_RMAP_RMAP_H_
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../rmap/RMAPCookie.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.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...

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

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

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

@ -1,7 +1,7 @@
#ifndef 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.

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

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

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

@ -1,7 +1,8 @@
#ifndef FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#define FRAMEWORK_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#ifndef FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#define FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "../../returnvalues/HasReturnvaluesIF.h"
class TmPacketMinimal;
class PacketTimestampInterpreterIF {
@ -9,9 +10,10 @@ public:
virtual ~PacketTimestampInterpreterIF() {}
virtual ReturnValue_t getPacketTime(TmPacketMinimal* packet,
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_
#define TMTCPACKET_PUS_TMPACKETBASE_H_
#include "../../SpacePacketBase.h"
#include "../../../timemanager/TimeStamperIF.h"
#include "../../../timemanager/Clock.h"
#include "../../../objectmanager/SystemObjectIF.h"
#include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "fsfw/timemanager/TimeStamperIF.h"
#include "fsfw/timemanager/Clock.h"
#include "fsfw/objectmanager/SystemObjectIF.h"
namespace Factory {
namespace Factory{
void setStaticFrameworkObjectIds();
}

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

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

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

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

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

@ -4,12 +4,12 @@
#include "AcceptsTelemetryIF.h"
#include "AcceptsTelecommandsIF.h"
#include "../objectmanager/SystemObject.h"
#include "../tasks/ExecutableObjectIF.h"
#include "../ipc/MessageQueueIF.h"
#include "../storagemanager/StorageManagerIF.h"
#include "../container/DynamicFIFO.h"
#include "../tmtcservices/TmTcMessage.h"
#include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/tasks/ExecutableObjectIF.h"
#include "fsfw/ipc/MessageQueueIF.h"
#include "fsfw/storagemanager/StorageManagerIF.h"
#include "fsfw/container/DynamicFIFO.h"
#include "fsfw/tmtcservices/TmTcMessage.h"
class TmTcBridge : public AcceptsTelemetryIF,
public AcceptsTelecommandsIF,

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

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

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

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