Merge branch 'mueller/master' into meier/dhbMultipleReplies

2021-04-25 10:49:56 +02:00
parent ff33a1274d cac9a0eecd
commit e7c00b5633
28 changed files with 1105 additions and 500 deletions
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@ -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;