fsfw/fsfw
11
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

Tests can now be built as part of FSFW and versioning moved to CMake #500

Merged
mohr merged 33 commits from KSat/fsfw:mueller/integrated-unittests into development 2021-10-18 14:42:53 +02:00
Conversation 20 Commits 33 Files Changed 56 +869 -745
73 changed files with 869 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f67868516c - Show all commits

10
src/fsfw/pus/Service5EventReporting.cpp
View File

@@ -41,8 +41,7 @@ ReturnValue_t Service5EventReporting::performService() {
} }
} }
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::debug << "Service5EventReporting::generateEventReport:" sif::warning << "Service5EventReporting::generateEventReport: Too many events" << std::endl;
" Too many events" << std::endl;
#endif #endif
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
@@ -64,8 +63,11 @@ ReturnValue_t Service5EventReporting::generateEventReport(
requestQueue->getDefaultDestination(),requestQueue->getId()); requestQueue->getDefaultDestination(),requestQueue->getId());
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::debug << "Service5EventReporting::generateEventReport:" sif::warning << "Service5EventReporting::generateEventReport: "
" Could not send TM packet" << std::endl; "Could not send TM packet" << std::endl;
#else
sif::printWarning("Service5EventReporting::generateEventReport: "
"Could not send TM packet\n");
#endif #endif
} }
return result; return result;

4
src/fsfw/pus/Service8FunctionManagement.cpp
View File

@@ -33,8 +33,8 @@ ReturnValue_t Service8FunctionManagement::getMessageQueueAndObject(
if(tcDataLen < sizeof(object_id_t)) { if(tcDataLen < sizeof(object_id_t)) {
return CommandingServiceBase::INVALID_TC; return CommandingServiceBase::INVALID_TC;
} }
SerializeAdapter::deSerialize(objectId, &tcData, // Can't fail, size was checked before
&tcDataLen, SerializeIF::Endianness::BIG); SerializeAdapter::deSerialize(objectId, &tcData, &tcDataLen, SerializeIF::Endianness::BIG);
return checkInterfaceAndAcquireMessageQueue(id,objectId); return checkInterfaceAndAcquireMessageQueue(id,objectId);
} }

4
src/fsfw/returnvalues/HasReturnvaluesIF.h
View File

@@ -22,9 +22,9 @@ public:
* @param number * @param number
* @return * @return
*/ */
static constexpr ReturnValue_t makeReturnCode(uint8_t interfaceId, static constexpr ReturnValue_t makeReturnCode(uint8_t classId,
uint8_t number) { uint8_t number) {
return (static_cast<ReturnValue_t>(interfaceId) << 8) + number; return (static_cast<ReturnValue_t>(classId) << 8) + number;
} }
}; };