Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools

This commit is contained in:
muellerr committed 2020-11-02 14:41:47 +01:00
commit 1f632b9331
36 files changed
+1443 -989

No files matched your search

+1 -1
View File
@@ -1251,7 +1251,7 @@ void DeviceHandlerBase::buildInternalCommand(void) {
if (result == BUSY) {
//so we can track misconfigurations
sif::debug << std::hex << getObjectId()
<< ": DHB::buildInternalCommand: Busy" << std::endl;
<< ": DHB::buildInternalCommand: Busy" << std::dec << std::endl;
result = NOTHING_TO_SEND; //no need to report this
}
}