Hide attr/extaddress from API.

See dresden-elektronik#8053.
ebaauw · Dec 21, 2024 · c6b836f · c6b836f
1 parent 19652d6
commit c6b836f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/device.cpp b/device.cpp
@@ -2154,7 +2154,7 @@ Device::Device(DeviceKey key, deCONZ::ApsController *apsCtrl, QObject *parent) :
 
     addItem(DataTypeBool, RStateReachable);
     addItem(DataTypeBool, RCapSleeper);
-    addItem(DataTypeUInt64, RAttrExtAddress);
+    addItem(DataTypeUInt64, RAttrExtAddress)->setIsPublic(false);
     addItem(DataTypeUInt16, RAttrNwkAddress);
     addItem(DataTypeString, RAttrUniqueId)->setValue(generateUniqueId(key, 0, 0));
     addItem(DataTypeString, RAttrManufacturerName);

diff --git a/rest_lights.cpp b/rest_lights.cpp
@@ -252,15 +252,7 @@ bool DeRestPluginPrivate::lightToMap(const ApiRequest &req, LightNode *lightNode
 
             const ApiAttribute a = rid.toApi(map, event);
             QVariantMap *p = a.map;
-            if (rid.suffix == RAttrExtAddress)
-            {
-                const quint64 value = item->toNumber();
-                (*p)[a.key] = value;
-            }
-            else
-            {
-                (*p)[a.key] = item->toVariant();
-            }
+            (*p)[a.key] = item->toVariant();
 
             if (event && item->needPushChange())
             {

diff --git a/rest_sensors.cpp b/rest_sensors.cpp
@@ -2687,15 +2687,7 @@ bool DeRestPluginPrivate::sensorToMap(Sensor *sensor, QVariantMap &map, const Ap
 
             const ApiAttribute a = rid.toApi(map, event);
             QVariantMap *p = a.map;
-            if (rid.suffix == RAttrExtAddress)
-            {
-                const quint64 value = item->toNumber();
-                (*p)[a.key] = value;
-            }
-            else
-            {
-                (*p)[a.key] = item->toVariant();
-            }
+            (*p)[a.key] = item->toVariant();
 
             if (event && item->needPushChange())
             {