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

include fix

Browse Source
This commit is contained in:
Robin Müller 2020-09-29 13:54:08 +02:00
parent 3663d7269c
commit 1691d63169
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datapoollocal/LocalDataPoolManager.cpp
View File

@ -6,11 +6,13 @@
#include "../ipc/MutexFactory.h" #include "../ipc/MutexFactory.h"
#include "../ipc/MutexHelper.h" #include "../ipc/MutexHelper.h"
#include "../ipc/QueueFactory.h" #include "../ipc/QueueFactory.h"
#include "../objectmanager/frameworkObjects.h"
#include <array> #include <array>
#include <cmath> #include <cmath>
object_id_t LocalDataPoolManager::defaultHkDestination = objects::NO_OBJECT; object_id_t LocalDataPoolManager::defaultHkDestination =
objects::PUS_SERVICE_3_HOUSEKEEPING;
LocalDataPoolManager::LocalDataPoolManager(HasLocalDataPoolIF* owner, LocalDataPoolManager::LocalDataPoolManager(HasLocalDataPoolIF* owner,
MessageQueueIF* queueToUse, bool appendValidityBuffer): MessageQueueIF* queueToUse, bool appendValidityBuffer):

1
objectmanager/frameworkObjects.h
View File

@ -6,6 +6,7 @@ enum framework_objects {
// Default verification reporter. // Default verification reporter.
PUS_SERVICE_1_VERIFICATION = 0x53000001, PUS_SERVICE_1_VERIFICATION = 0x53000001,
PUS_SERVICE_2_DEVICE_ACCESS = 0x53000002, PUS_SERVICE_2_DEVICE_ACCESS = 0x53000002,
PUS_SERVICE_3_HOUSEKEEPING = 0x53000003,
PUS_SERVICE_5_EVENT_REPORTING = 0x53000005, PUS_SERVICE_5_EVENT_REPORTING = 0x53000005,
PUS_SERVICE_8_FUNCTION_MGMT = 0x53000008, PUS_SERVICE_8_FUNCTION_MGMT = 0x53000008,
PUS_SERVICE_9_TIME_MGMT = 0x53000009, PUS_SERVICE_9_TIME_MGMT = 0x53000009,

12
tmtcservices/PusVerificationReport.h
View File

@ -1,9 +1,11 @@
#ifndef PUSVERIFICATIONREPORT_H_ #ifndef FSFW_TMTCSERVICES_PUSVERIFICATIONREPORT_H_
#define PUSVERIFICATIONREPORT_H_ #define FSFW_TMTCSERVICES_PUSVERIFICATIONREPORT_H_
#include "VerificationCodes.h"
#include "../ipc/MessageQueueMessage.h" #include "../ipc/MessageQueueMessage.h"
#include "../tmtcpacket/pus/TcPacketBase.h" #include "../tmtcpacket/pus/TcPacketBase.h"
#include "../tmtcservices/VerificationCodes.h" #include "../returnvalues/HasReturnvaluesIF.h"
class PusVerificationMessage: public MessageQueueMessage { class PusVerificationMessage: public MessageQueueMessage {
private: private:
@ -30,7 +32,7 @@ private:
public: public:
static const uint8_t VERIFICATION_MIN_SIZE = 6; static const uint8_t VERIFICATION_MIN_SIZE = 6;
PusVerificationMessage(); PusVerificationMessage();
// PusVerificationMessage( uint8_t set_report_id, TcPacketBase* current_packet, ReturnValue_t set_error_code = 0, uint8_t set_step = 0, uint32_t parameter1 = 0, uint32_t parameter2 = 0 );
PusVerificationMessage(uint8_t set_report_id, uint8_t ackFlags, PusVerificationMessage(uint8_t set_report_id, uint8_t ackFlags,
uint16_t tcPacketId, uint16_t tcSequenceControl, uint16_t tcPacketId, uint16_t tcSequenceControl,
ReturnValue_t set_error_code = 0, uint8_t set_step = 0, ReturnValue_t set_error_code = 0, uint8_t set_step = 0,
@ -74,4 +76,4 @@ public:
uint8_t* getReport(); uint8_t* getReport();
}; };
#endif /* PUSVERIFICATIONREPORT_H_ */ #endif /* FSFW_TMTCSERVICES_PUSVERIFICATIONREPORT_H_ */