esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

new error code added

Browse Source
This commit is contained in:
Robin Müller 2020-09-19 17:14:09 +02:00
parent 4ab7a08387
commit 02f778ea1d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
datapoollocal/LocalDataPoolManager.cpp
View File

@ -163,11 +163,12 @@ ReturnValue_t LocalDataPoolManager::handleHousekeepingMessage(
&newCollIntvl); &newCollIntvl);
if(command == HousekeepingMessage:: if(command == HousekeepingMessage::
MODIFY_DIAGNOSTICS_REPORT_COLLECTION_INTERVAL) { MODIFY_DIAGNOSTICS_REPORT_COLLECTION_INTERVAL) {
return changeCollectionInterval(sid, newCollIntvl, true); result = changeCollectionInterval(sid, newCollIntvl, true);
} }
else { else {
return changeCollectionInterval(sid, newCollIntvl, false); result = changeCollectionInterval(sid, newCollIntvl, false);
} }
break;
} }
case(HousekeepingMessage::GENERATE_ONE_PARAMETER_REPORT): case(HousekeepingMessage::GENERATE_ONE_PARAMETER_REPORT):
@ -343,7 +344,7 @@ ReturnValue_t LocalDataPoolManager::changeCollectionInterval(sid_t sid,
if(dataSet->periodicHelper == nullptr) { if(dataSet->periodicHelper == nullptr) {
// config error // config error
return HasReturnvaluesIF::RETURN_FAILED; return PERIODIC_HELPER_INVALID;
} }
dataSet->periodicHelper->changeCollectionInterval(newCollectionInterval); dataSet->periodicHelper->changeCollectionInterval(newCollectionInterval);

1
datapoollocal/LocalDataPoolManager.h
View File

@ -57,6 +57,7 @@ public:
static constexpr ReturnValue_t WRONG_HK_PACKET_TYPE = MAKE_RETURN_CODE(0x03); static constexpr ReturnValue_t WRONG_HK_PACKET_TYPE = MAKE_RETURN_CODE(0x03);
static constexpr ReturnValue_t REPORTING_STATUS_UNCHANGED = MAKE_RETURN_CODE(0x04); static constexpr ReturnValue_t REPORTING_STATUS_UNCHANGED = MAKE_RETURN_CODE(0x04);
static constexpr ReturnValue_t PERIODIC_HELPER_INVALID = MAKE_RETURN_CODE(0x05);
/** /**
* This constructor is used by a class which wants to implement * This constructor is used by a class which wants to implement
* a personal local data pool. The queueToUse can be supplied if it * a personal local data pool. The queueToUse can be supplied if it