commit 85fa3c69646282c43e55b36eb5d04403fd067a26
author Zhikui Ren <zhikui.ren@intel.com> Sat Feb 26 23:03:34 2022 -0800
committer Zhikui Ren <zhikui.ren@intel.com> Wed Mar 09 09:05:43 2022 -0800
tree 6fc500d052e37bcbae7e0bc9a072f789f59372ff
parent 6ad74d9f369884f5ae4c40301c2c01a2ece33105

PSUSensor: add raa229126 type and labels

Add new device type raa229126 for psusensor.
Also add more supported labels to the properties array.

Fix one minor typo in log message.

Tested:
IMPI sensors are created correctly for the new devices and supported
labels.

Signed-off-by: Zhikui Ren <zhikui.ren@intel.com>
Change-Id: Id845a701ac0ebc988d3910369d2b9a86b4fe9644

src/PSUSensorMain.cpp

diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 1377128..56ba438 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -70,6 +70,7 @@
      "xyz.openbmc_project.Configuration.RAA228000",
      "xyz.openbmc_project.Configuration.RAA228228",
      "xyz.openbmc_project.Configuration.RAA229004",
+     "xyz.openbmc_project.Configuration.RAA229126",
      "xyz.openbmc_project.Configuration.TPS546D24",
      "xyz.openbmc_project.Configuration.XDPE12284"})};
 
@@ -104,6 +105,7 @@
     "raa228000",
     "raa228228",
     "raa229004",
+    "raa229126",
     "tps546d24",
     "xdpe12284"
 })};
@@ -424,7 +426,7 @@
             std::vector<thresholds::Threshold> confThresholds;
             if (!parseThresholdsFromConfig(*sensorData, confThresholds))
             {
-                std::cerr << "error populating totoal thresholds\n";
+                std::cerr << "error populating total thresholds\n";
             }
             thresholdConfSize = confThresholds.size();
 
@@ -958,10 +960,15 @@
 
     labelMatch = {
         {"pin", PSUProperty("Input Power", 3000, 0, 6, 0)},
+        {"pin1", PSUProperty("Input Power", 3000, 0, 6, 0)},
+        {"pin2", PSUProperty("Input Power", 3000, 0, 6, 0)},
         {"pout1", PSUProperty("Output Power", 3000, 0, 6, 0)},
         {"pout2", PSUProperty("Output Power", 3000, 0, 6, 0)},
         {"pout3", PSUProperty("Output Power", 3000, 0, 6, 0)},
         {"power1", PSUProperty("Output Power", 3000, 0, 6, 0)},
+        {"power2", PSUProperty("Output Power", 3000, 0, 6, 0)},
+        {"power3", PSUProperty("Output Power", 3000, 0, 6, 0)},
+        {"power4", PSUProperty("Output Power", 3000, 0, 6, 0)},
         {"maxpin", PSUProperty("Max Input Power", 3000, 0, 6, 0)},
         {"vin", PSUProperty("Input Voltage", 300, 0, 3, 0)},
         {"maxvin", PSUProperty("Max Input Voltage", 300, 0, 3, 0)},
@@ -1007,6 +1014,8 @@
         {"in6", PSUProperty("Output Voltage", 255, 0, 3, 0)},
         {"in7", PSUProperty("Output Voltage", 255, 0, 3, 0)},
         {"iin", PSUProperty("Input Current", 20, 0, 3, 0)},
+        {"iin1", PSUProperty("Input Current", 20, 0, 3, 0)},
+        {"iin2", PSUProperty("Input Current", 20, 0, 3, 0)},
         {"iout1", PSUProperty("Output Current", 255, 0, 3, 0)},
         {"iout2", PSUProperty("Output Current", 255, 0, 3, 0)},
         {"iout3", PSUProperty("Output Current", 255, 0, 3, 0)},
@@ -1022,6 +1031,9 @@
         {"iout13", PSUProperty("Output Current", 255, 0, 3, 0)},
         {"iout14", PSUProperty("Output Current", 255, 0, 3, 0)},
         {"curr1", PSUProperty("Output Current", 255, 0, 3, 0)},
+        {"curr2", PSUProperty("Output Current", 255, 0, 3, 0)},
+        {"curr3", PSUProperty("Output Current", 255, 0, 3, 0)},
+        {"curr4", PSUProperty("Output Current", 255, 0, 3, 0)},
         {"maxiout1", PSUProperty("Max Output Current", 255, 0, 3, 0)},
         {"temp1", PSUProperty("Temperature", 127, -128, 3, 0)},
         {"temp2", PSUProperty("Temperature", 127, -128, 3, 0)},