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

2020-11-02 14:41:47 +01:00
parent 878796f546 096643971b
commit 1f632b9331
36 changed files with 1443 additions and 989 deletions
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@ -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
 		}
 	}