From 02f778ea1d4bbe07df38a7e58ca50ebf6ea81232 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Sat, 19 Sep 2020 17:14:09 +0200 Subject: [PATCH] new error code added --- datapoollocal/LocalDataPoolManager.cpp | 7 ++++--- datapoollocal/LocalDataPoolManager.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/datapoollocal/LocalDataPoolManager.cpp b/datapoollocal/LocalDataPoolManager.cpp index 20d6451d..635fafce 100644 --- a/datapoollocal/LocalDataPoolManager.cpp +++ b/datapoollocal/LocalDataPoolManager.cpp @@ -163,11 +163,12 @@ ReturnValue_t LocalDataPoolManager::handleHousekeepingMessage( &newCollIntvl); if(command == HousekeepingMessage:: MODIFY_DIAGNOSTICS_REPORT_COLLECTION_INTERVAL) { - return changeCollectionInterval(sid, newCollIntvl, true); + result = changeCollectionInterval(sid, newCollIntvl, true); } else { - return changeCollectionInterval(sid, newCollIntvl, false); + result = changeCollectionInterval(sid, newCollIntvl, false); } + break; } case(HousekeepingMessage::GENERATE_ONE_PARAMETER_REPORT): @@ -343,7 +344,7 @@ ReturnValue_t LocalDataPoolManager::changeCollectionInterval(sid_t sid, if(dataSet->periodicHelper == nullptr) { // config error - return HasReturnvaluesIF::RETURN_FAILED; + return PERIODIC_HELPER_INVALID; } dataSet->periodicHelper->changeCollectionInterval(newCollectionInterval); diff --git a/datapoollocal/LocalDataPoolManager.h b/datapoollocal/LocalDataPoolManager.h index 505b9b1a..44b15f59 100644 --- a/datapoollocal/LocalDataPoolManager.h +++ b/datapoollocal/LocalDataPoolManager.h @@ -57,6 +57,7 @@ public: 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 PERIODIC_HELPER_INVALID = MAKE_RETURN_CODE(0x05); /** * This constructor is used by a class which wants to implement * a personal local data pool. The queueToUse can be supplied if it