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

using 100 line width now

Browse Source
This commit is contained in:
Robin Müller 2021-01-11 22:32:36 +01:00
parent 44955db341
commit 0be4c35b73
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
datapoollocal/LocalDataPoolManager.cpp
View File

@ -16,9 +16,9 @@
object_id_t LocalDataPoolManager::defaultHkDestination = object_id_t LocalDataPoolManager::defaultHkDestination =
objects::PUS_SERVICE_3_HOUSEKEEPING; objects::PUS_SERVICE_3_HOUSEKEEPING;
LocalDataPoolManager::LocalDataPoolManager(HasLocalDataPoolIF* owner, LocalDataPoolManager::LocalDataPoolManager(HasLocalDataPoolIF* owner, MessageQueueIF* queueToUse,
MessageQueueIF* queueToUse, bool appendValidityBuffer): bool appendValidityBuffer):
appendValidityBuffer(appendValidityBuffer) { appendValidityBuffer(appendValidityBuffer) {
if(owner == nullptr) { if(owner == nullptr) {
printWarningOrError(fsfw::OutputTypes::OUT_WARNING, printWarningOrError(fsfw::OutputTypes::OUT_WARNING,
"LocalDataPoolManager", HasReturnvaluesIF::RETURN_FAILED, "LocalDataPoolManager", HasReturnvaluesIF::RETURN_FAILED,
@ -148,12 +148,11 @@ ReturnValue_t LocalDataPoolManager::handleHkUpdate(HkReceiver& receiver,
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
ReturnValue_t LocalDataPoolManager::handleNotificationUpdate( ReturnValue_t LocalDataPoolManager::handleNotificationUpdate(HkReceiver& receiver,
HkReceiver& receiver, ReturnValue_t& status) { ReturnValue_t& status) {
MarkChangedIF* toReset = nullptr; MarkChangedIF* toReset = nullptr;
if(receiver.dataType == DataType::LOCAL_POOL_VARIABLE) { if(receiver.dataType == DataType::LOCAL_POOL_VARIABLE) {
LocalPoolObjectBase* poolObj = owner->getPoolObjectHandle( LocalPoolObjectBase* poolObj = owner->getPoolObjectHandle(receiver.dataId.localPoolId);
receiver.dataId.localPoolId);
if(poolObj == nullptr) { if(poolObj == nullptr) {
printWarningOrError(fsfw::OutputTypes::OUT_WARNING, printWarningOrError(fsfw::OutputTypes::OUT_WARNING,
"handleNotificationUpdate", POOLOBJECT_NOT_FOUND); "handleNotificationUpdate", POOLOBJECT_NOT_FOUND);
@ -162,8 +161,8 @@ ReturnValue_t LocalDataPoolManager::handleNotificationUpdate(
if(poolObj->hasChanged()) { if(poolObj->hasChanged()) {
// prepare and send update notification. // prepare and send update notification.
CommandMessage notification; CommandMessage notification;
HousekeepingMessage::setUpdateNotificationVariableCommand( HousekeepingMessage::setUpdateNotificationVariableCommand(&notification,
&notification, receiver.dataId.localPoolId); receiver.dataId.localPoolId);
ReturnValue_t result = hkQueue->sendMessage( ReturnValue_t result = hkQueue->sendMessage(
receiver.destinationQueue, &notification); receiver.destinationQueue, &notification);
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
@ -174,8 +173,7 @@ ReturnValue_t LocalDataPoolManager::handleNotificationUpdate(
} }
else { else {
LocalPoolDataSetBase* dataSet = owner->getDataSetHandle( LocalPoolDataSetBase* dataSet = owner->getDataSetHandle(receiver.dataId.sid);
receiver.dataId.sid);
if(dataSet == nullptr) { if(dataSet == nullptr) {
printWarningOrError(fsfw::OutputTypes::OUT_WARNING, printWarningOrError(fsfw::OutputTypes::OUT_WARNING,
"handleNotificationUpdate", DATASET_NOT_FOUND); "handleNotificationUpdate", DATASET_NOT_FOUND);