commit 5a86e562ac81df7712f74e4518ca0f0b36a47775
author Bruce Mitchell <bruce.mitchell@linux.vnet.ibm.com> Fri Dec 10 12:26:22 2021 -0600
committer Bruce Mitchell <bruce.mitchell@linux.vnet.ibm.com> Fri Dec 10 12:35:26 2021 -0600
tree 5287ac8116eac17d2cf7acd84592efdcfe52aa85
parent 0e68f19968f2501701cb53a9a66506c7bc497a05

Fixes Units for Temperature & Pressure for Hwmon

For pressure the units are Pascals and was missing in SensorPaths.cpp
Also changed to align with the rest of dbus-sensors and set units
as sensor_paths::unitDegreesC and sensor_paths::unitPascals instead
of literal string constants.

Tested: on Everest's Storm King Op Panels with busctl introspect \
--no-pager xyz.openbmc_project.HwmonTempSensor /xyz/openbmc_project/\
sensors/temperature/Ambient_1_Temp and with
busctl introspect --no-pager xyz.openbmc_project.HwmonTempSensor \
/xyz/openbmc_project/sensors/pressure/Station_Pressure
the .Unit fields are now align with the rest of dbus-sensors

Signed-off-by: Bruce Mitchell <bruce.mitchell@linux.vnet.ibm.com>
Change-Id: I46ce300d1f04e05c65196d69f6201db8ba266ad9

src/HwmonTempMain.cpp

diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index de74c39..670947b 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -76,7 +76,8 @@
                                                .maxValue = maxValueTemperature,
                                                .offsetValue = 0.0,
                                                .scaleValue = 1.0,
-                                               .units = "DegreesC",
+                                               .units =
+                                                   sensor_paths::unitDegreesC,
                                                .typeName = "temperature"};
 
     // For IIO RAW sensors we get a raw_value, an offset, and scale
@@ -126,7 +127,7 @@
         // Pressures are read in kilopascal, we need Pascals.
         tmpSensorParameters.scaleValue *= 1000.0;
         tmpSensorParameters.typeName = "pressure";
-        tmpSensorParameters.units = "Pascals";
+        tmpSensorParameters.units = sensor_paths::unitPascals;
     }
     else
     {

src/SensorPaths.cpp

diff --git a/src/SensorPaths.cpp b/src/SensorPaths.cpp
index b0cea9c..2e73012 100644
--- a/src/SensorPaths.cpp
+++ b/src/SensorPaths.cpp
@@ -45,6 +45,10 @@
     {
         return "Utilization";
     }
+    if (units == "Pascals" || units == unitPascals)
+    {
+        return "pressure";
+    }
     return "";
 }