commit be4ffa8720adfe03e00da0e4c16b1769f8540a72
author Jeremy Kerr <jk@codeconstruct.com.au> Mon Aug 10 16:17:37 2020 +0800
committer Vernon Mauery <vernon.mauery@linux.intel.com> Thu Oct 01 21:42:06 2020 +0000
tree 4938bc1fa4c3c884cedd0d79dad7375ea675a31a
parent 8deea358e2ed6511b0eba0d7fca477deffe1a6ff

sensor yaml: allow custom sensor names

Currently, we can only name sensors based on data from the dbus object
implementing a sensor's interface. While this mostly works, there may
not be a sensible name to extract in all cases.

This change introduces an optional sensorName property to the sensor
YAML description, which allows a custom name to be used.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Change-Id: I3f3b8ef581c70fbde94db122d4f3c0ca181c6ff7

sensorhandler.cpp

diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index d2fac66..e23ea48 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -715,7 +715,12 @@
     }
 
     /* ID string */
-    auto id_string = info->sensorNameFunc(*info);
+    auto id_string = info->sensorName;
+
+    if (id_string.empty())
+    {
+        id_string = info->sensorNameFunc(*info);
+    }
 
     if (id_string.length() > FULL_RECORD_ID_STR_MAX_LENGTH)
     {