KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 3 Releases Wiki Activity

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +14 -11
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45a55044dd - Show all commits

25
events/EventManager.cpp
View File

@ -133,20 +133,23 @@ void EventManager::printEvent(EventMessage* message) {
break; break;
default: default:
string = translateObject(message->getReporter()); string = translateObject(message->getReporter());
sif::error << "EventManager: "; sif::debug << "EventManager: ";
if (string != 0) { if (string != 0) {
sif::error << string; sif::debug << string;
} else {
sif::error << "0x" << std::hex << message->getReporter() << std::dec;
} }
sif::error << " reported " << translateEvents(message->getEvent()) << " (" else {
<< std::dec << message->getEventId() << ") " << std::endl; sif::debug << "0x" << std::hex << message->getReporter() << std::dec;
}
sif::error << std::hex << "P1 Hex: 0x" << message->getParameter1() << ", P1 Dec: " sif::debug << " reported " << translateEvents(message->getEvent())
<< std::dec << message->getParameter1() << std::endl; << " (" << std::dec << message->getEventId() << ") "
sif::error << std::hex << "P2 Hex: 0x" << message->getParameter2() << ", P2 Dec: " << std::endl;
<< std::dec << message->getParameter2() << std::endl;
sif::debug << std::hex << "P1 Hex: 0x" << message->getParameter1()
<< ", P1 Dec: " << std::dec << message->getParameter1()
<< std::endl;
sif::debug << std::hex << "P2 Hex: 0x" << message->getParameter2()
<< ", P2 Dec: " << std::dec << message->getParameter2()
<< std::endl;
break; break;
} }