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

Merge branch 'mueller_sifRenaming_soooMany' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-04-23 19:21:12 +02:00
parent 1415cd2339 2c6b446500
commit 01195093e3
36 changed files with 117 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
events/EventManager.cpp
View File

@ -117,30 +117,33 @@ void EventManager::printEvent(EventMessage* message) {
switch (message->getSeverity()) {
case SEVERITY::INFO:
// string = translateObject(message->getReporter());
// info << "EVENT: ";
// sif::info << "EVENT: ";
// if (string != 0) {
// info << string;
// sif::info << string;
// } else {
// info << "0x" << std::hex << message->getReporter() << std::dec;
// sif::info << "0x" << std::hex << message->getReporter() << std::dec;
// }
// info << " reported " << translateEvents(message->getEvent()) << " ("
// sif::info << " reported " << translateEvents(message->getEvent()) << " ("
// << std::dec << message->getEventId() << std::hex << ") P1: 0x"
// << message->getParameter1() << " P2: 0x"
// << message->getParameter2() << std::dec << std::endl;
break;
default:
string = translateObject(message->getReporter());
error << "EVENT: ";
sif::error << "EVENT: ";
if (string != 0) {
error << string;
sif::error << string;
} else {
error << "0x" << std::hex << message->getReporter() << std::dec;
sif::error << "0x" << std::hex << message->getReporter() << std::dec;
}
error << " reported " << translateEvents(message->getEvent()) << " ("
sif::error << " reported " << translateEvents(message->getEvent()) << " ("
<< std::dec << message->getEventId() << ") " << std::endl;
error << std::hex << "P1 Hex: 0x" << message->getParameter1() << ", P1 Dec: " << std::dec << message->getParameter1() << std::endl;
error << std::hex << "P2 Hex: 0x" << message->getParameter2() << ", P2 Dec: " << std::dec << message->getParameter2() << std::endl;
sif::error << std::hex << "P1 Hex: 0x" << message->getParameter1() << ", P1 Dec: "
<< std::dec << message->getParameter1() << std::endl;
sif::error << std::hex << "P2 Hex: 0x" << message->getParameter2() << ", P2 Dec: "
<< std::dec << message->getParameter2() << std::endl;
break;
}