mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into mohr_serialize

Browse Source
This commit is contained in:
Ulrich Mohr
2020-07-03 11:59:15 +02:00
parent cf3190a904 3cd946fef8
commit 8c68895c06
86 changed files with 2218 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datapool/PoolRawAccess.cpp
View File

@ -42,7 +42,7 @@ ReturnValue_t PoolRawAccess::read() {
} else {
//Error entry does not exist.
}
error << "PoolRawAccess: read of DP Variable 0x" << std::hex << dataPoolId
sif::error << "PoolRawAccess: read of DP Variable 0x" << std::hex << dataPoolId
<< std::dec << " failed." << std::endl;
valid = INVALID;
typeSize = 0;
@ -123,7 +123,7 @@ ReturnValue_t PoolRawAccess::setEntryFromBigEndian(const uint8_t* buffer,
#endif
return HasReturnvaluesIF::RETURN_OK;
} else {
error << "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal"
sif::error << "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal"
<< (uint32_t) typeSize << ", Requested: " << setSize
<< std::endl;
return INCORRECT_SIZE;