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

Merge branch 'mueller/master' into meier/dhbMultipleReplies

Browse Source
This commit is contained in:
Robin Müller
2021-04-24 23:43:53 +02:00
parent 52b549b97c cac9a0eecd
commit e7cfd324ae
28 changed files with 1105 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devicehandlers/DeviceHandlerBase.cpp
View File

@ -1524,7 +1524,7 @@ void DeviceHandlerBase::printWarningOrError(sif::OutputTypes errorType,
}
else if(errorType == sif::OutputTypes::OUT_ERROR) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "DeviceHandlerBase::" << functionName << ": Object ID "
sif::error << "DeviceHandlerBase::" << functionName << ": Object ID 0x"
<< std::hex << std::setw(8) << std::setfill('0')
<< this->getObjectId() << " | " << errorPrint << std::dec
<< std::setfill(' ') << std::endl;