Handle ext address > 2^63 -1

Fixes dresden-elektronik#8053
ebaauw · Dec 2, 2024 · 5f8762a · 5f8762a
1 parent 7ad5f9c
commit 5f8762a
Show file tree

Hide file tree

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

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