changes taken over

This commit is contained in:
Robin Müller 2020-09-29 13:37:21 +02:00
parent 7b1f72254f
commit 3663d7269c
2 changed files with 11 additions and 10 deletions

View File

@ -1,12 +1,13 @@
#include "../tmtcservices/VerificationReporter.h" #include "VerificationReporter.h"
#include "AcceptsVerifyMessageIF.h"
#include "PusVerificationReport.h"
#include "../ipc/MessageQueueIF.h" #include "../ipc/MessageQueueIF.h"
#include "../tmtcservices/AcceptsVerifyMessageIF.h"
#include "../tmtcservices/PusVerificationReport.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../objectmanager/frameworkObjects.h" #include "../objectmanager/frameworkObjects.h"
object_id_t VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION; object_id_t VerificationReporter::messageReceiver =
objects::PUS_SERVICE_1_VERIFICATION;
VerificationReporter::VerificationReporter() : VerificationReporter::VerificationReporter() :
acknowledgeQueue(MessageQueueIF::NO_QUEUE) { acknowledgeQueue(MessageQueueIF::NO_QUEUE) {
@ -98,8 +99,8 @@ void VerificationReporter::initialize() {
if (temp == nullptr) { if (temp == nullptr) {
sif::error << "VerificationReporter::initialize: Message " sif::error << "VerificationReporter::initialize: Message "
<< "receiver invalid. Make sure it is set up properly and " << "receiver invalid. Make sure it is set up properly and "
<<"implementsAcceptsVerifyMessageIF" << std::endl; << "implementsAcceptsVerifyMessageIF" << std::endl;
return;
} }
this->acknowledgeQueue = temp->getVerificationQueue(); this->acknowledgeQueue = temp->getVerificationQueue();
} }

View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_ #ifndef FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
#define FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_ #define FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
#include "PusVerificationReport.h"
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
#include "../tmtcservices/PusVerificationReport.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();
@ -47,4 +47,4 @@ private:
MessageQueueId_t acknowledgeQueue; MessageQueueId_t acknowledgeQueue;
}; };
#endif /* FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_ */ #endif /* FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_ */