Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat

This commit is contained in:
2020-05-20 14:38:41 +02:00
45 changed files with 229 additions and 148 deletions

View File

@ -15,7 +15,7 @@ ReturnValue_t MemoryHelper::handleMemoryCommand(CommandMessage* message) {
lastSender = message->getSender();
lastCommand = message->getCommand();
if (busy) {
debug << "MemHelper: Busy!" << std::endl;
sif::debug << "MemHelper: Busy!" << std::endl;
}
switch (lastCommand) {
case MemoryMessage::CMD_MEMORY_DUMP: