Cleanup debug prints and remove addr.toStringExt() usage (dresden-elektronik#7140)

manup · web-flow · commit 048d3d73cfcf · 2023-08-03T20:11:27.000+02:00
The PR removes various legacy log outputs which I think aren't relevant anymore and superseeded by DDFs.

Further `QString deCONZ::Address::toStringExt()` is deprecated in first steps to create a QString alternative. Since its a heavy method also which allocates memory on each call, change debug printing to plain numeric printf. It isn't pretty but will do for now. There will be a better method to print MAC addresses soon.
diff --git a/bindings.cpp b/bindings.cpp
@@ -284,24 +284,13 @@ void DeRestPluginPrivate::handleMgmtBindRspIndication(const deCONZ::ApsDataIndic
     stream >> seqNo;
     stream >> status;
 
-    if (btReader)
-    {
-        DBG_Printf(DBG_ZDP, "MgmtBind_rsp id: %d %s seq: %u, status 0x%02X \n", btReader->apsReq.id(),
-                   qPrintable(node->address().toStringExt()), seqNo, status);
-    }
-    else
-    {
-        DBG_Printf(DBG_ZDP, "MgmtBind_rsp (no BTR) %s seq: %u, status 0x%02X \n", qPrintable(node->address().toStringExt()), seqNo, status);
-    }
-
     if (status != deCONZ::ZdpSuccess)
     {
         if (status == deCONZ::ZdpNotPermitted ||
             status == deCONZ::ZdpNotSupported)
         {
             if (node->mgmtBindSupported())
             {
-                DBG_Printf(DBG_ZDP, "MgmtBind_req/rsp %s not supported, deactivate \n", qPrintable(node->address().toStringExt()));
                 node->setMgmtBindSupported(false);
             }
         }
@@ -347,7 +336,7 @@ void DeRestPluginPrivate::handleMgmtBindRspIndication(const deCONZ::ApsDataIndic
             btReader->state = BindingTableReader::StateFinished;
         }
 
-        enqueueEvent({RDevices, REventBindingTable, status, ind.srcAddress().ext()});
+        enqueueEvent({RDevices, REventBindingTable, status, ind.srcAddress().ext()}); // TODO(mpi): I think this event is obsolete and should be removed
     }
 
     while (listCount && !stream.atEnd())
diff --git a/de_web_plugin.cpp b/de_web_plugin.cpp
@@ -2527,7 +2527,6 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node)
             if (lightNode2->node() != node)
             {
                 lightNode2->setNode(const_cast<deCONZ::Node*>(node));
-                DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(lightNode2->id()), qPrintable(node->address().toStringExt()));
             }
 
             lightNode2->setManufacturerCode(node->nodeDescriptor().manufacturerCode());
@@ -2539,7 +2538,6 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node)
             {
                 // the node existed before
                 // refresh all with new values
-                DBG_Printf(DBG_INFO, "LightNode %u: %s updated\n", lightNode2->id().toUInt(), qPrintable(lightNode2->name()));
                 reachable->setValue(avail);
                 Event e(RLights, RStateReachable, lightNode2->id(), reachable);
                 enqueueEvent(e);
@@ -3354,7 +3352,6 @@ void DeRestPluginPrivate::nodeZombieStateChanged(const deCONZ::Node *node)
             if (i->node() != node)
             {
                 i->setNode(const_cast<deCONZ::Node*>(node));
-                DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));
             }
 
             ResourceItem *item = i->item(RStateReachable);
@@ -3396,7 +3393,6 @@ void DeRestPluginPrivate::nodeZombieStateChanged(const deCONZ::Node *node)
                 if (i->node() != node)
                 {
                     i->setNode(const_cast<deCONZ::Node*>(node));
-                    DBG_Printf(DBG_INFO, "Sensor %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));
                 }
 
                 checkSensorNodeReachable(&(*i));
@@ -3438,7 +3434,6 @@ LightNode *DeRestPluginPrivate::updateLightNode(const deCONZ::NodeEvent &event)
     if (lightNode->node() != event.node())
     {
         lightNode->setNode(const_cast<deCONZ::Node*>(event.node()));
-        DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(lightNode->id()), qPrintable(event.node()->address().toStringExt()));
     }
 
     if (lightNode->toBool(RStateReachable))
@@ -5568,7 +5563,6 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::
                 if (i->node() != node)
                 {
                     i->setNode(const_cast<deCONZ::Node*>(node));
-                    DBG_Printf(DBG_INFO, "SensorNode %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));
 
                     pushSensorInfoToCore(&*i);
 
@@ -5578,7 +5572,6 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::
                         auto *itemPending = i->item(RConfigPending);
                         if (itemPending)
                         {
-                            DBG_Printf(DBG_INFO, "Init Poll Control for %s\n", qPrintable(node->address().toStringExt()));
                             pollControlInitialized = true;
                             itemPending->setValue(itemPending->toNumber() | R_PENDING_WRITE_POLL_CHECKIN_INTERVAL | R_PENDING_SET_LONG_POLL_INTERVAL);
                         }
@@ -8437,7 +8430,6 @@ void DeRestPluginPrivate::updateSensorNode(const deCONZ::NodeEvent &event)
         if (i->node() != event.node())
         {
             i->setNode(const_cast<deCONZ::Node*>(event.node()));
-            DBG_Printf(DBG_INFO, "Sensor %s set node %s\n", qPrintable(i->id()), qPrintable(event.node()->address().toStringExt()));
         }
 
         if (event.event() == deCONZ::NodeEvent::UpdatedClusterDataZclReport ||
@@ -12064,14 +12056,6 @@ void DeRestPluginPrivate::processTasks()
 
         if (!ok) // destination already busy
         {
-            if (i->req.dstAddressMode() == deCONZ::ApsExtAddress)
-            {
-                DBG_Printf(DBG_INFO_L2, "delay sending request %u ep: 0x%02X cluster 0x%04X to %s onAir %d\n", i->req.id(), i->req.dstEndpoint(), i->req.clusterId(), qPrintable(i->req.dstAddress().toStringExt()), onAir);
-            }
-            else if (i->req.dstAddressMode() == deCONZ::ApsGroupAddress)
-            {
-                DBG_Printf(DBG_INFO, "delay sending request %u - type: %d to group 0x%04X\n", i->req.id(), i->taskType, i->req.dstAddress().group());
-            }
         }
         else
         {
@@ -12247,7 +12231,6 @@ void DeRestPluginPrivate::nodeEvent(const deCONZ::NodeEvent &event)
 
     case deCONZ::NodeEvent::NodeZombieChanged:
     {
-        DBG_Printf(DBG_INFO, "Node zombie state changed %s\n", qPrintable(event.node()->address().toStringExt()));
         nodeZombieStateChanged(event.node());
     }
         break;
@@ -12328,8 +12311,6 @@ void DeRestPluginPrivate::nodeEvent(const deCONZ::NodeEvent &event)
             }
         }
 
-        DBG_Printf(DBG_INFO_L2, "Node data %s profileId: 0x%04X, clusterId: 0x%04X\n", qPrintable(event.node()->address().toStringExt()), event.profileId(), event.clusterId());
-
         // filter for supported sensor clusters
         switch (event.clusterId())
         {
@@ -12598,8 +12579,6 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi
         lightNode->setGroupCapacity(capacity);
         lightNode->setGroupCount(count);
 
-//        DBG_Printf(DBG_INFO, "verified group capacity: %u and group count: %u of LightNode %s\n", capacity, count, qPrintable(lightNode->address().toStringExt()));
-
         QVector<quint16> responseGroups;
         for (uint i = 0; i < count; i++)
         {
@@ -12610,7 +12589,7 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi
 
                 responseGroups.push_back(groupId);
 
-                DBG_Printf(DBG_INFO, "%s found group 0x%04X\n", qPrintable(lightNode->address().toStringExt()), groupId);
+                DBG_Printf(DBG_INFO, FMT_MAC " found group 0x%04X\n", (unsigned long long)lightNode->address().ext(), groupId);
 
                 foundGroup(groupId);
                 foundGroupMembership(lightNode, groupId);
@@ -12629,7 +12608,7 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi
                 && !responseGroups.contains(i->id)
                 && i->state == GroupInfo::StateInGroup)
             {
-                    DBG_Printf(DBG_INFO, "restore group  0x%04X for lightNode %s\n", i->id, qPrintable(lightNode->address().toStringExt()));
+                    DBG_Printf(DBG_INFO, FMT_MAC " restore group 0x%04X for lightNode\n", (unsigned long long)lightNode->address().ext(), i->id);
                     i->actions &= ~GroupInfo::ActionRemoveFromGroup; // sanity
                     i->actions |= GroupInfo::ActionAddToGroup;
                     i->state = GroupInfo::StateInGroup;
@@ -12888,7 +12867,7 @@ void DeRestPluginPrivate::handleSceneClusterIndication(const deCONZ::ApsDataIndi
 
                 if (i != v.end())
                 {
-                    DBG_Printf(DBG_INFO, "Added/stored scene %u in node %s Response. Status: 0x%02X\n", sceneId, qPrintable(lightNode->address().toStringExt()), status);
+                    DBG_Printf(DBG_INFO, FMT_MAC " added/stored scene %u response status: 0x%02X\n", (unsigned long long)lightNode->address().ext(), sceneId, status);
                     groupInfo->addScenes.erase(i);
 
                     if (status == 0x00)
@@ -13148,8 +13127,7 @@ void DeRestPluginPrivate::handleSceneClusterIndication(const deCONZ::ApsDataIndi
 
                 if (i != v.end())
                 {
-                    DBG_Printf(DBG_INFO, "Modified scene %u in node %s status 0x%02X\n", sceneId, qPrintable(lightNode->address().toStringExt()), status);
-
+                    DBG_Printf(DBG_INFO, FMT_MAC " modified scene %u status 0x%02X\n", (unsigned long long)lightNode->address().ext(), sceneId, status);
                     if (status == deCONZ::ZclSuccessStatus)
                     {
                         groupInfo->modifyScenesRetries = 0;
@@ -13874,7 +13852,7 @@ void DeRestPluginPrivate::handleCommissioningClusterIndication(const deCONZ::Aps
         stream >> startIndex;
         stream >> count;
 
-        DBG_Printf(DBG_INFO, "Get group identifiers response of sensor %s. Count: %u\n", qPrintable(sensorNode->address().toStringExt()), count);
+        DBG_Printf(DBG_INFO, FMT_MAC " get ZLL group identifiers response: count: %u\n", (unsigned long long)sensorNode->address().ext(), unsigned(count));
 
         while (!stream.atEnd() && epIter < count)
         {
diff --git a/de_web_widget.cpp b/de_web_widget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020 dresden elektronik ingenieurtechnik gmbh.
+ * Copyright (c) 2013-2023 dresden elektronik ingenieurtechnik gmbh.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -118,7 +118,6 @@ void DeRestWidget::readBindingTableTriggered()
 {
     if (m_selectedNodeAddress.hasExt())
     {
-
         auto *restNode = dynamic_cast<RestNodeBase*>(plugin->d->getLightNodeForAddress(m_selectedNodeAddress));
 
         if (!restNode)
@@ -129,7 +128,6 @@ void DeRestWidget::readBindingTableTriggered()
         if (restNode)
         {
             restNode->setMgmtBindSupported(true);
-            DBG_Printf(DBG_INFO, "read binding table for %s (%s) \n", qPrintable(m_selectedNodeAddress.toStringExt()), qPrintable(m_selectedNodeAddress.toStringNwk()));
             plugin->d->readBindingTable(restNode, 0);
         }
     }
diff --git a/reset_device.cpp b/reset_device.cpp
@@ -226,7 +226,7 @@ void DeRestPluginPrivate::handleMgmtLeaveRspIndication(const deCONZ::ApsDataIndi
         stream >> seqNo;    // use SeqNo ?
         stream >> status;
 
-        DBG_Printf(DBG_INFO, "MgmtLeave_rsp %s seq: %u, status 0x%02X \n", qPrintable(ind.srcAddress().toStringExt()), seqNo, status);
+        DBG_Printf(DBG_INFO, "MgmtLeave_rsp " FMT_MAC " seq: %u, status 0x%02X \n", (unsigned long long)ind.srcAddress().ext(), seqNo, status);
 
         if (status == deCONZ::ZdpSuccess || status == deCONZ::ZdpNotSupported)
         {
diff --git a/rest_lights.cpp b/rest_lights.cpp
@@ -1610,7 +1610,7 @@ int DeRestPluginPrivate::setLightState(const ApiRequest &req, ApiResponse &rsp)
 
     if (!taskRef.lightNode->stateChanges().empty())
     {
-        DBG_Printf(DBG_INFO, "emit event/tick: %s\n", qPrintable(taskRef.lightNode->address().toStringExt()));
+        DBG_Printf(DBG_INFO, "emit event/tick: " FMT_MAC "\n", (unsigned long long)taskRef.lightNode->address().ext());
         enqueueEvent({taskRef.lightNode->prefix(), REventTick, taskRef.lightNode->uniqueId(), taskRef.lightNode->address().ext()});
     }
 
diff --git a/rest_touchlink.cpp b/rest_touchlink.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 dresden elektronik ingenieurtechnik gmbh.
+ * Copyright (c) 2016-2023 dresden elektronik ingenieurtechnik gmbh.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -174,7 +174,7 @@ int DeRestPluginPrivate::getTouchlinkScanResults(const ApiRequest &req, ApiRespo
     for (; i != end; ++i)
     {
         QVariantMap item;
-        item["address"] = i->address.toStringExt();
+        item["address"] = QString("0x%1").arg(i->address.ext(), int(16), int(16), QChar('0'));
         item["factorynew"] = i->factoryNew;
         item["rssi"] = (double)i->rssi;
         item["channel"] = (double)i->channel;
@@ -793,8 +793,8 @@ void DeRestPluginPrivate::interpanDataIndication(const QByteArray &data)
             scanResponse.transactionId = touchlinkReq.transactionId();
             scanResponse.rssi = rssi;
 
-            DBG_Printf(DBG_TLINK, "scan response %s, fn=%u, channel=%u rssi=%d TrId=0x%08X in state=%d action=%d\n",
-                       qPrintable(scanResponse.address.toStringExt()),
+            DBG_Printf(DBG_TLINK, "scan response " FMT_MAC ", fn=%u, channel=%u rssi=%d TrId=0x%08X in state=%d action=%d\n",
+                       (unsigned long long)scanResponse.address.ext(),
                        scanResponse.factoryNew, touchlinkChannel, rssi, scanResponse.transactionId,
                        touchlinkState, touchlinkAction);
 
diff --git a/window_covering.cpp b/window_covering.cpp
@@ -69,9 +69,6 @@
  *    To leave calibration mode, clear bit #1 in the Mode attribute, e.g. write attribute 0x0017 as 0x00.
  */
 
-
-
-#include "de_web_plugin.h"
 #include "de_web_plugin_private.h"
 #include "product_match.h"
 
@@ -646,10 +643,10 @@ void DeRestPluginPrivate::calibrateWindowCoveringNextStep()
     TaskItem task;
     copyTaskReq(calibrationTask, task);
 
-    DBG_Printf(DBG_INFO, "ubisys NextStep calibrationStep = %d, task=%s calibrationTask = %s \n",
+    DBG_Printf(DBG_INFO, "ubisys NextStep calibrationStep = %d, task=" FMT_MAC " calibrationTask = " FMT_MAC "\n",
                calibrationStep,
-               qPrintable(task.req.dstAddress().toStringExt()),
-               qPrintable(calibrationTask.req.dstAddress().toStringExt()));
+               (unsigned long long)task.req.dstAddress().ext(),
+               (unsigned long long)calibrationTask.req.dstAddress().ext());
 
     switch(calibrationStep)
     {
diff --git a/zdp/zdp_handlers.cpp b/zdp/zdp_handlers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 dresden elektronik ingenieurtechnik gmbh.
+ * Copyright (c) 2021-2023 dresden elektronik ingenieurtechnik gmbh.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -8,7 +8,6 @@
  *
  */
 
-#include "de_web_plugin.h"
 #include "de_web_plugin_private.h"
 #include "utils/utils.h"
 #include "zdp_handlers.h"
@@ -131,7 +130,7 @@ void DeRestPluginPrivate::handleDeviceAnnceIndication(const deCONZ::ApsDataIndic
                 updateEtag(gwConfigEtag);
             }
 
-            DBG_Printf(DBG_INFO, "DeviceAnnce of LightNode: %s Permit Join: %i\n", qPrintable(i->address().toStringExt()), gwPermitJoinDuration);
+            DBG_Printf(DBG_INFO, "DeviceAnnce of LightNode: " FMT_MAC " Permit Join: %i\n", (unsigned long long)i->address().ext(), gwPermitJoinDuration);
 
             // force reading attributes
             i->enableRead(READ_GROUPS | READ_SCENES);

Original file line number	Diff line number	Diff line change
`@@ -284,24 +284,13 @@ void DeRestPluginPrivate::handleMgmtBindRspIndication(const deCONZ::ApsDataIndic`
`284`	`284`	`stream >> seqNo;`
`285`	`285`	`stream >> status;`
`286`	`286`
`287`		`- if (btReader)`
`288`		`- {`
`289`		`- DBG_Printf(DBG_ZDP, "MgmtBind_rsp id: %d %s seq: %u, status 0x%02X \n", btReader->apsReq.id(),`
`290`		`- qPrintable(node->address().toStringExt()), seqNo, status);`
`291`		`- }`
`292`		`- else`
`293`		`- {`
`294`		`- DBG_Printf(DBG_ZDP, "MgmtBind_rsp (no BTR) %s seq: %u, status 0x%02X \n", qPrintable(node->address().toStringExt()), seqNo, status);`
`295`		`- }`
`296`		`-`
`297`	`287`	`if (status != deCONZ::ZdpSuccess)`
`298`	`288`	`{`
`299`	`289`	`if (status == deCONZ::ZdpNotPermitted \|\|`
`300`	`290`	`status == deCONZ::ZdpNotSupported)`
`301`	`291`	`{`
`302`	`292`	`if (node->mgmtBindSupported())`
`303`	`293`	`{`
`304`		`- DBG_Printf(DBG_ZDP, "MgmtBind_req/rsp %s not supported, deactivate \n", qPrintable(node->address().toStringExt()));`
`305`	`294`	`node->setMgmtBindSupported(false);`
`306`	`295`	`}`
`307`	`296`	`}`
`@@ -347,7 +336,7 @@ void DeRestPluginPrivate::handleMgmtBindRspIndication(const deCONZ::ApsDataIndic`
`347`	`336`	`btReader->state = BindingTableReader::StateFinished;`
`348`	`337`	`}`
`349`	`338`
`350`		`- enqueueEvent({RDevices, REventBindingTable, status, ind.srcAddress().ext()});`
	`339`	`+ enqueueEvent({RDevices, REventBindingTable, status, ind.srcAddress().ext()}); // TODO(mpi): I think this event is obsolete and should be removed`
`351`	`340`	`}`
`352`	`341`
`353`	`342`	`while (listCount && !stream.atEnd())`
Original file line number	Diff line number	Diff line change
`@@ -2527,7 +2527,6 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node)`
`2527`	`2527`	`if (lightNode2->node() != node)`
`2528`	`2528`	`{`
`2529`	`2529`	`lightNode2->setNode(const_cast<deCONZ::Node*>(node));`
`2530`		`- DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(lightNode2->id()), qPrintable(node->address().toStringExt()));`
`2531`	`2530`	`}`
`2532`	`2531`
`2533`	`2532`	`lightNode2->setManufacturerCode(node->nodeDescriptor().manufacturerCode());`
`@@ -2539,7 +2538,6 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node)`
`2539`	`2538`	`{`
`2540`	`2539`	`// the node existed before`
`2541`	`2540`	`// refresh all with new values`
`2542`		`- DBG_Printf(DBG_INFO, "LightNode %u: %s updated\n", lightNode2->id().toUInt(), qPrintable(lightNode2->name()));`
`2543`	`2541`	`reachable->setValue(avail);`
`2544`	`2542`	`Event e(RLights, RStateReachable, lightNode2->id(), reachable);`
`2545`	`2543`	`enqueueEvent(e);`
`@@ -3354,7 +3352,6 @@ void DeRestPluginPrivate::nodeZombieStateChanged(const deCONZ::Node *node)`
`3354`	`3352`	`if (i->node() != node)`
`3355`	`3353`	`{`
`3356`	`3354`	`i->setNode(const_cast<deCONZ::Node*>(node));`
`3357`		`- DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));`
`3358`	`3355`	`}`
`3359`	`3356`
`3360`	`3357`	`ResourceItem *item = i->item(RStateReachable);`
`@@ -3396,7 +3393,6 @@ void DeRestPluginPrivate::nodeZombieStateChanged(const deCONZ::Node *node)`
`3396`	`3393`	`if (i->node() != node)`
`3397`	`3394`	`{`
`3398`	`3395`	`i->setNode(const_cast<deCONZ::Node*>(node));`
`3399`		`- DBG_Printf(DBG_INFO, "Sensor %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));`
`3400`	`3396`	`}`
`3401`	`3397`
`3402`	`3398`	`checkSensorNodeReachable(&(*i));`
`@@ -3438,7 +3434,6 @@ LightNode *DeRestPluginPrivate::updateLightNode(const deCONZ::NodeEvent &event)`
`3438`	`3434`	`if (lightNode->node() != event.node())`
`3439`	`3435`	`{`
`3440`	`3436`	`lightNode->setNode(const_cast<deCONZ::Node*>(event.node()));`
`3441`		`- DBG_Printf(DBG_INFO, "LightNode %s set node %s\n", qPrintable(lightNode->id()), qPrintable(event.node()->address().toStringExt()));`
`3442`	`3437`	`}`
`3443`	`3438`
`3444`	`3439`	`if (lightNode->toBool(RStateReachable))`
`@@ -5568,7 +5563,6 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::`
`5568`	`5563`	`if (i->node() != node)`
`5569`	`5564`	`{`
`5570`	`5565`	`i->setNode(const_cast<deCONZ::Node*>(node));`
`5571`		`- DBG_Printf(DBG_INFO, "SensorNode %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));`
`5572`	`5566`
`5573`	`5567`	`pushSensorInfoToCore(&*i);`
`5574`	`5568`
`@@ -5578,7 +5572,6 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::`
`5578`	`5572`	`auto *itemPending = i->item(RConfigPending);`
`5579`	`5573`	`if (itemPending)`
`5580`	`5574`	`{`
`5581`		`- DBG_Printf(DBG_INFO, "Init Poll Control for %s\n", qPrintable(node->address().toStringExt()));`
`5582`	`5575`	`pollControlInitialized = true;`
`5583`	`5576`	`itemPending->setValue(itemPending->toNumber() \| R_PENDING_WRITE_POLL_CHECKIN_INTERVAL \| R_PENDING_SET_LONG_POLL_INTERVAL);`
`5584`	`5577`	`}`
`@@ -8437,7 +8430,6 @@ void DeRestPluginPrivate::updateSensorNode(const deCONZ::NodeEvent &event)`
`8437`	`8430`	`if (i->node() != event.node())`
`8438`	`8431`	`{`
`8439`	`8432`	`i->setNode(const_cast<deCONZ::Node*>(event.node()));`
`8440`		`- DBG_Printf(DBG_INFO, "Sensor %s set node %s\n", qPrintable(i->id()), qPrintable(event.node()->address().toStringExt()));`
`8441`	`8433`	`}`
`8442`	`8434`
`8443`	`8435`	`if (event.event() == deCONZ::NodeEvent::UpdatedClusterDataZclReport \|\|`
`@@ -12064,14 +12056,6 @@ void DeRestPluginPrivate::processTasks()`
`12064`	`12056`
`12065`	`12057`	`if (!ok) // destination already busy`
`12066`	`12058`	`{`
`12067`		`- if (i->req.dstAddressMode() == deCONZ::ApsExtAddress)`
`12068`		`- {`
`12069`		`- DBG_Printf(DBG_INFO_L2, "delay sending request %u ep: 0x%02X cluster 0x%04X to %s onAir %d\n", i->req.id(), i->req.dstEndpoint(), i->req.clusterId(), qPrintable(i->req.dstAddress().toStringExt()), onAir);`
`12070`		`- }`
`12071`		`- else if (i->req.dstAddressMode() == deCONZ::ApsGroupAddress)`
`12072`		`- {`
`12073`		`- DBG_Printf(DBG_INFO, "delay sending request %u - type: %d to group 0x%04X\n", i->req.id(), i->taskType, i->req.dstAddress().group());`
`12074`		`- }`
`12075`	`12059`	`}`
`12076`	`12060`	`else`
`12077`	`12061`	`{`
`@@ -12247,7 +12231,6 @@ void DeRestPluginPrivate::nodeEvent(const deCONZ::NodeEvent &event)`
`12247`	`12231`
`12248`	`12232`	`case deCONZ::NodeEvent::NodeZombieChanged:`
`12249`	`12233`	`{`
`12250`		`- DBG_Printf(DBG_INFO, "Node zombie state changed %s\n", qPrintable(event.node()->address().toStringExt()));`
`12251`	`12234`	`nodeZombieStateChanged(event.node());`
`12252`	`12235`	`}`
`12253`	`12236`	`break;`
`@@ -12328,8 +12311,6 @@ void DeRestPluginPrivate::nodeEvent(const deCONZ::NodeEvent &event)`
`12328`	`12311`	`}`
`12329`	`12312`	`}`
`12330`	`12313`
`12331`		`- DBG_Printf(DBG_INFO_L2, "Node data %s profileId: 0x%04X, clusterId: 0x%04X\n", qPrintable(event.node()->address().toStringExt()), event.profileId(), event.clusterId());`
`12332`		`-`
`12333`	`12314`	`// filter for supported sensor clusters`
`12334`	`12315`	`switch (event.clusterId())`
`12335`	`12316`	`{`
`@@ -12598,8 +12579,6 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi`
`12598`	`12579`	`lightNode->setGroupCapacity(capacity);`
`12599`	`12580`	`lightNode->setGroupCount(count);`
`12600`	`12581`
`12601`		`-// DBG_Printf(DBG_INFO, "verified group capacity: %u and group count: %u of LightNode %s\n", capacity, count, qPrintable(lightNode->address().toStringExt()));`
`12602`		`-`
`12603`	`12582`	`QVector<quint16> responseGroups;`
`12604`	`12583`	`for (uint i = 0; i < count; i++)`
`12605`	`12584`	`{`
`@@ -12610,7 +12589,7 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi`
`12610`	`12589`
`12611`	`12590`	`responseGroups.push_back(groupId);`
`12612`	`12591`
`12613`		`- DBG_Printf(DBG_INFO, "%s found group 0x%04X\n", qPrintable(lightNode->address().toStringExt()), groupId);`
	`12592`	`+ DBG_Printf(DBG_INFO, FMT_MAC " found group 0x%04X\n", (unsigned long long)lightNode->address().ext(), groupId);`
`12614`	`12593`
`12615`	`12594`	`foundGroup(groupId);`
`12616`	`12595`	`foundGroupMembership(lightNode, groupId);`
`@@ -12629,7 +12608,7 @@ void DeRestPluginPrivate::handleGroupClusterIndication(const deCONZ::ApsDataIndi`
`12629`	`12608`	`&& !responseGroups.contains(i->id)`
`12630`	`12609`	`&& i->state == GroupInfo::StateInGroup)`
`12631`	`12610`	`{`
`12632`		`- DBG_Printf(DBG_INFO, "restore group 0x%04X for lightNode %s\n", i->id, qPrintable(lightNode->address().toStringExt()));`
	`12611`	`+ DBG_Printf(DBG_INFO, FMT_MAC " restore group 0x%04X for lightNode\n", (unsigned long long)lightNode->address().ext(), i->id);`
`12633`	`12612`	`i->actions &= ~GroupInfo::ActionRemoveFromGroup; // sanity`
`12634`	`12613`	`i->actions \|= GroupInfo::ActionAddToGroup;`
`12635`	`12614`	`i->state = GroupInfo::StateInGroup;`
`@@ -12888,7 +12867,7 @@ void DeRestPluginPrivate::handleSceneClusterIndication(const deCONZ::ApsDataIndi`
`12888`	`12867`
`12889`	`12868`	`if (i != v.end())`
`12890`	`12869`	`{`
`12891`		`- DBG_Printf(DBG_INFO, "Added/stored scene %u in node %s Response. Status: 0x%02X\n", sceneId, qPrintable(lightNode->address().toStringExt()), status);`
	`12870`	`+ DBG_Printf(DBG_INFO, FMT_MAC " added/stored scene %u response status: 0x%02X\n", (unsigned long long)lightNode->address().ext(), sceneId, status);`
`12892`	`12871`	`groupInfo->addScenes.erase(i);`
`12893`	`12872`
`12894`	`12873`	`if (status == 0x00)`
`@@ -13148,8 +13127,7 @@ void DeRestPluginPrivate::handleSceneClusterIndication(const deCONZ::ApsDataIndi`
`13148`	`13127`
`13149`	`13128`	`if (i != v.end())`
`13150`	`13129`	`{`
`13151`		`- DBG_Printf(DBG_INFO, "Modified scene %u in node %s status 0x%02X\n", sceneId, qPrintable(lightNode->address().toStringExt()), status);`
`13152`		`-`
	`13130`	`+ DBG_Printf(DBG_INFO, FMT_MAC " modified scene %u status 0x%02X\n", (unsigned long long)lightNode->address().ext(), sceneId, status);`
`13153`	`13131`	`if (status == deCONZ::ZclSuccessStatus)`
`13154`	`13132`	`{`
`13155`	`13133`	`groupInfo->modifyScenesRetries = 0;`
`@@ -13874,7 +13852,7 @@ void DeRestPluginPrivate::handleCommissioningClusterIndication(const deCONZ::Aps`
`13874`	`13852`	`stream >> startIndex;`
`13875`	`13853`	`stream >> count;`
`13876`	`13854`
`13877`		`- DBG_Printf(DBG_INFO, "Get group identifiers response of sensor %s. Count: %u\n", qPrintable(sensorNode->address().toStringExt()), count);`
	`13855`	`+ DBG_Printf(DBG_INFO, FMT_MAC " get ZLL group identifiers response: count: %u\n", (unsigned long long)sensorNode->address().ext(), unsigned(count));`
`13878`	`13856`
`13879`	`13857`	`while (!stream.atEnd() && epIter < count)`
`13880`	`13858`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2013-2020 dresden elektronik ingenieurtechnik gmbh.`
	`2`	`+ * Copyright (c) 2013-2023 dresden elektronik ingenieurtechnik gmbh.`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* The software in this package is published under the terms of the BSD`
`@@ -118,7 +118,6 @@ void DeRestWidget::readBindingTableTriggered()`
`118`	`118`	`{`
`119`	`119`	`if (m_selectedNodeAddress.hasExt())`
`120`	`120`	`{`
`121`		`-`
`122`	`121`	`auto restNode = dynamic_cast<RestNodeBase>(plugin->d->getLightNodeForAddress(m_selectedNodeAddress));`
`123`	`122`
`124`	`123`	`if (!restNode)`
`@@ -129,7 +128,6 @@ void DeRestWidget::readBindingTableTriggered()`
`129`	`128`	`if (restNode)`
`130`	`129`	`{`
`131`	`130`	`restNode->setMgmtBindSupported(true);`
`132`		`- DBG_Printf(DBG_INFO, "read binding table for %s (%s) \n", qPrintable(m_selectedNodeAddress.toStringExt()), qPrintable(m_selectedNodeAddress.toStringNwk()));`
`133`	`131`	`plugin->d->readBindingTable(restNode, 0);`
`134`	`132`	`}`
`135`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ void DeRestPluginPrivate::handleMgmtLeaveRspIndication(const deCONZ::ApsDataIndi`
`226`	`226`	`stream >> seqNo; // use SeqNo ?`
`227`	`227`	`stream >> status;`
`228`	`228`
`229`		`- DBG_Printf(DBG_INFO, "MgmtLeave_rsp %s seq: %u, status 0x%02X \n", qPrintable(ind.srcAddress().toStringExt()), seqNo, status);`
	`229`	`+ DBG_Printf(DBG_INFO, "MgmtLeave_rsp " FMT_MAC " seq: %u, status 0x%02X \n", (unsigned long long)ind.srcAddress().ext(), seqNo, status);`
`230`	`230`
`231`	`231`	`if (status == deCONZ::ZdpSuccess \|\| status == deCONZ::ZdpNotSupported)`
`232`	`232`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1610,7 +1610,7 @@ int DeRestPluginPrivate::setLightState(const ApiRequest &req, ApiResponse &rsp)`
`1610`	`1610`
`1611`	`1611`	`if (!taskRef.lightNode->stateChanges().empty())`
`1612`	`1612`	`{`
`1613`		`- DBG_Printf(DBG_INFO, "emit event/tick: %s\n", qPrintable(taskRef.lightNode->address().toStringExt()));`
	`1613`	`+ DBG_Printf(DBG_INFO, "emit event/tick: " FMT_MAC "\n", (unsigned long long)taskRef.lightNode->address().ext());`
`1614`	`1614`	`enqueueEvent({taskRef.lightNode->prefix(), REventTick, taskRef.lightNode->uniqueId(), taskRef.lightNode->address().ext()});`
`1615`	`1615`	`}`
`1616`	`1616`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2021 dresden elektronik ingenieurtechnik gmbh.`
	`2`	`+ * Copyright (c) 2021-2023 dresden elektronik ingenieurtechnik gmbh.`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* The software in this package is published under the terms of the BSD`
`@@ -8,7 +8,6 @@`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`
`11`		`-#include "de_web_plugin.h"`
`12`	`11`	`#include "de_web_plugin_private.h"`
`13`	`12`	`#include "utils/utils.h"`
`14`	`13`	`#include "zdp_handlers.h"`
`@@ -131,7 +130,7 @@ void DeRestPluginPrivate::handleDeviceAnnceIndication(const deCONZ::ApsDataIndic`
`131`	`130`	`updateEtag(gwConfigEtag);`
`132`	`131`	`}`
`133`	`132`
`134`		`- DBG_Printf(DBG_INFO, "DeviceAnnce of LightNode: %s Permit Join: %i\n", qPrintable(i->address().toStringExt()), gwPermitJoinDuration);`
	`133`	`+ DBG_Printf(DBG_INFO, "DeviceAnnce of LightNode: " FMT_MAC " Permit Join: %i\n", (unsigned long long)i->address().ext(), gwPermitJoinDuration);`
`135`	`134`
`136`	`135`	`// force reading attributes`
`137`	`136`	`i->enableRead(READ_GROUPS \| READ_SCENES);`