KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

test auto-initializers

Browse Source
This commit is contained in:
Robin Müller
2022-07-26 18:46:28 +02:00
parent 1954ce0ea4
commit 8bf0fb9885
18 changed files with 215 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fsfw/tmtcservices/CommandingServiceBase.cpp
View File

@ -104,9 +104,12 @@ ReturnValue_t CommandingServiceBase::initialize() {
errReporter =
ObjectManager::instance()->get<InternalErrorReporterIF>(objects::INTERNAL_ERROR_REPORTER);
if (errReporter != nullptr) {
tmSendHelper.setInternalErrorReporter(errReporter);
tmSendHelper.setInternalErrorReporter(*errReporter);
}
} else {
tmSendHelper.setInternalErrorReporter(*errReporter);
}
if (verificationReporter == nullptr) {
verificationReporter =
ObjectManager::instance()->get<VerificationReporterIF>(objects::TC_VERIFICATOR);

4
src/fsfw/tmtcservices/CommandingServiceBase.h
View File

@ -18,7 +18,7 @@
namespace Factory {
void setStaticFrameworkObjectIds();
}
};
/**
* @brief This class is the basis for all PUS Services, which have to
@ -38,7 +38,7 @@ class CommandingServiceBase : public SystemObject,
public AcceptsTelecommandsIF,
public ExecutableObjectIF,
public HasReturnvaluesIF {
friend void(Factory::setStaticFrameworkObjectIds)();
friend void Factory::setStaticFrameworkObjectIds();
public:
// We could make this configurable via preprocessor and the FSFWConfig file.

45
src/fsfw/tmtcservices/PusServiceBase.cpp
View File

@ -9,8 +9,8 @@
#include "fsfw/tmtcservices/TmTcMessage.h"
#include "fsfw/tmtcservices/tcHelpers.h"
object_id_t PusServiceBase::packetDestination = 0;
object_id_t PusServiceBase::pusDistributor = 0;
object_id_t PusServiceBase::PACKET_DESTINATION = 0;
object_id_t PusServiceBase::PUS_DISTRIBUTOR = 0;
PusServiceBase::PusServiceBase(PsbParams params)
: SystemObject(params.objectId), psbParams(params) {}
@ -83,7 +83,12 @@ void PusServiceBase::handleRequestQueue() {
uint16_t PusServiceBase::getIdentifier() { return psbParams.serviceId; }
MessageQueueId_t PusServiceBase::getRequestQueue() { return psbParams.reqQueue->getId(); }
MessageQueueId_t PusServiceBase::getRequestQueue() {
if (psbParams.reqQueue == nullptr) {
return MessageQueueIF::NO_QUEUE;
}
return psbParams.reqQueue->getId();
}
ReturnValue_t PusServiceBase::initialize() {
ReturnValue_t result = SystemObject::initialize();
@ -96,15 +101,16 @@ ReturnValue_t PusServiceBase::initialize() {
} else {
ownedQueue = false;
}
if (psbParams.tmReceiver == nullptr) {
psbParams.tmReceiver = ObjectManager::instance()->get<AcceptsTelemetryIF>(packetDestination);
psbParams.tmReceiver = ObjectManager::instance()->get<AcceptsTelemetryIF>(PACKET_DESTINATION);
if (psbParams.tmReceiver != nullptr) {
psbParams.reqQueue->setDefaultDestination(psbParams.tmReceiver->getReportReceptionQueue());
}
}
if (psbParams.pusDistributor != nullptr) {
psbParams.pusDistributor = ObjectManager::instance()->get<PUSDistributorIF>(pusDistributor);
if (psbParams.pusDistributor == nullptr) {
psbParams.pusDistributor = ObjectManager::instance()->get<PUSDistributorIF>(PUS_DISTRIBUTOR);
if (psbParams.pusDistributor != nullptr) {
registerService(*psbParams.pusDistributor);
}
@ -127,17 +133,10 @@ ReturnValue_t PusServiceBase::initialize() {
return HasReturnvaluesIF::RETURN_OK;
}
ReturnValue_t PusServiceBase::initializeAfterTaskCreation() {
// If task parameters, for example task frequency are required, this
// function should be overriden and the system object task IF can
// be used to get those parameters.
return HasReturnvaluesIF::RETURN_OK;
}
void PusServiceBase::setTcPool(StorageManagerIF& tcPool) { psbParams.tcPool = &tcPool; }
void PusServiceBase::setCustomTcStore(StorageManagerIF* tcPool) { psbParams.tcPool = tcPool; }
void PusServiceBase::setCustomErrorReporter(InternalErrorReporterIF* errReporter_) {
psbParams.errReporter = errReporter_;
void PusServiceBase::setErrorReporter(InternalErrorReporterIF& errReporter_) {
psbParams.errReporter = &errReporter_;
}
void PusServiceBase::initializeTmHelpers(TmSendHelper& tmSendHelper, TmStoreHelper& tmStoreHelper) {
@ -155,8 +154,10 @@ void PusServiceBase::initializeTmSendHelper(TmSendHelper& tmSendHelper) {
psbParams.errReporter =
ObjectManager::instance()->get<InternalErrorReporterIF>(objects::INTERNAL_ERROR_REPORTER);
if (psbParams.errReporter != nullptr) {
tmSendHelper.setInternalErrorReporter(psbParams.errReporter);
tmSendHelper.setInternalErrorReporter(*psbParams.errReporter);
}
} else {
tmSendHelper.setInternalErrorReporter(*psbParams.errReporter);
}
}
@ -164,16 +165,16 @@ void PusServiceBase::initializeTmStoreHelper(TmStoreHelper& tmStoreHelper) const
tmStoreHelper.setApid(psbParams.apid);
}
void PusServiceBase::setVerificationReporter(VerificationReporterIF* reporter) {
psbParams.verifReporter = reporter;
void PusServiceBase::setVerificationReporter(VerificationReporterIF& reporter) {
psbParams.verifReporter = &reporter;
}
ReturnValue_t PusServiceBase::registerService(PUSDistributorIF& distributor) {
return distributor.registerService(this);
}
void PusServiceBase::setTmReceiver(AcceptsTelemetryIF* tmReceiver_) {
psbParams.tmReceiver = tmReceiver_;
void PusServiceBase::setTmReceiver(AcceptsTelemetryIF& tmReceiver_) {
psbParams.tmReceiver = &tmReceiver_;
}
void PusServiceBase::setRequestQueue(MessageQueueIF* reqQueue) { psbParams.reqQueue = reqQueue; }
void PusServiceBase::setRequestQueue(MessageQueueIF& reqQueue) { psbParams.reqQueue = &reqQueue; }

26
src/fsfw/tmtcservices/PusServiceBase.h
View File

@ -14,10 +14,6 @@
#include "fsfw/tasks/ExecutableObjectIF.h"
#include "fsfw/tcdistribution/PUSDistributorIF.h"
namespace Factory {
void setStaticFrameworkObjectIds();
}
class StorageManagerIF;
/**
@ -71,6 +67,10 @@ struct PsbParams {
PUSDistributorIF* pusDistributor = nullptr;
};
namespace Factory {
void setStaticFrameworkObjectIds();
}
/**
* @defgroup pus_services PUS Service Framework
* These group contains all implementations of PUS Services in the OBSW.
@ -93,7 +93,7 @@ class PusServiceBase : public ExecutableObjectIF,
public AcceptsTelecommandsIF,
public SystemObject,
public HasReturnvaluesIF {
friend void(Factory::setStaticFrameworkObjectIds)();
friend void Factory::setStaticFrameworkObjectIds();
public:
/**
@ -121,11 +121,11 @@ class PusServiceBase : public ExecutableObjectIF,
* function will create one
* @param reqQueue
*/
void setRequestQueue(MessageQueueIF* reqQueue);
void setTmReceiver(AcceptsTelemetryIF* tmReceiver);
void setCustomTcStore(StorageManagerIF* tcStore);
void setVerificationReporter(VerificationReporterIF* reporter);
void setCustomErrorReporter(InternalErrorReporterIF* errReporter);
void setRequestQueue(MessageQueueIF& reqQueue);
void setTmReceiver(AcceptsTelemetryIF& tmReceiver);
void setTcPool(StorageManagerIF& tcStore);
void setVerificationReporter(VerificationReporterIF& reporter);
void setErrorReporter(InternalErrorReporterIF& errReporter);
/**
* Helper methods if the implementing class wants to send telemetry
@ -190,7 +190,6 @@ class PusServiceBase : public ExecutableObjectIF,
ReturnValue_t initialize() override;
void setTaskIF(PeriodicTaskIF* taskHandle) override;
ReturnValue_t initializeAfterTaskCreation() override;
protected:
/**
@ -215,9 +214,8 @@ class PusServiceBase : public ExecutableObjectIF,
PusTcReader currentPacket;
bool ownedQueue = true;
static object_id_t packetDestination;
static object_id_t pusDistributor;
VerifSuccessParams successParams;
static object_id_t PACKET_DESTINATION;
static object_id_t PUS_DISTRIBUTOR;
private:
void handleRequestQueue();

4
src/fsfw/tmtcservices/TmSendHelper.cpp
View File

@ -30,8 +30,8 @@ ReturnValue_t TmSendHelper::sendPacket(const store_address_t &storeId) {
void TmSendHelper::setDefaultDestination(MessageQueueId_t msgDest) { defaultDest = msgDest; }
void TmSendHelper::setInternalErrorReporter(InternalErrorReporterIF *reporter) {
errReporter = reporter;
void TmSendHelper::setInternalErrorReporter(InternalErrorReporterIF &reporter) {
errReporter = &reporter;
}
void TmSendHelper::setMsgQueue(MessageQueueIF &queue_) { queue = &queue_; }

2
src/fsfw/tmtcservices/TmSendHelper.h
View File

@ -23,7 +23,7 @@ class TmSendHelper {
[[nodiscard]] bool areFaultsIgnored() const;
void ignoreFaults();
void dontIgnoreFaults();
void setInternalErrorReporter(InternalErrorReporterIF* reporter);
void setInternalErrorReporter(InternalErrorReporterIF& reporter);
[[nodiscard]] InternalErrorReporterIF* getInternalErrorReporter() const;
ReturnValue_t sendPacket(MessageQueueId_t dest, const store_address_t& storeId);
ReturnValue_t sendPacket(const store_address_t& storeId);