From 6c4e2e917d6ebfc92d1d7ec0ff95b87b28cab258 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@us.ibm.com>
Date: Wed, 28 Dec 2016 13:38:31 -0500
Subject: Sensors: Add additional namespaces

Add the current, power and energy namespaces.

Change-Id: I0c8d54e8b0910534dab77faedb25ae9cd1339102
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../Sensor/Threshold/Critical.interface.yaml              |  4 ++++
 .../Sensor/Threshold/Warning.interface.yaml               |  4 ++++
 xyz/openbmc_project/Sensor/Value.interface.yaml           | 15 +++++++++++++++
 3 files changed, 23 insertions(+)

(limited to 'xyz/openbmc_project/Sensor')

diff --git a/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml b/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
index ad90e6f..548feb5 100644
--- a/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
@@ -6,6 +6,9 @@ description: >
       fan_tach
       voltage
       altitude
+      current
+      power
+      energy
 
     Additionally, any object implementing Sensor.Threshold.Critical must also
     implement Sensor.Value.
@@ -28,4 +31,5 @@ properties:
           CriticalAlarm may be set to False to clear an alarm condition.
           The behavior of setting CriticalAlarm to True is undefined.
 
+
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml b/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
index 84bf8fa..f8ef993 100644
--- a/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
@@ -6,6 +6,10 @@ description: >
       fan_tach
       voltage
       altitude
+      current
+      power
+      energy
+
 
     Additionally, any object implementing Sensor.Threshold.Warning must also
     implement Sensor.Value.
diff --git a/xyz/openbmc_project/Sensor/Value.interface.yaml b/xyz/openbmc_project/Sensor/Value.interface.yaml
index f8c1585..2a060e8 100644
--- a/xyz/openbmc_project/Sensor/Value.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Value.interface.yaml
@@ -7,6 +7,9 @@ description: >
       fan_tach
       voltage
       altitude
+      current
+      power
+      energy
 
     Any service implementing Sensor.Value on one or more objects must
     implement org.freedesktop.DBus.ObjectManager on the sensors namespace root.
@@ -26,6 +29,9 @@ properties:
           For objects in the fan_tach namespace, Unit must be "RPMS".
           For objects in the voltage namespace, Unit must be "Volts".
           For objects in the altitude namespace, Unit must be "Meters".
+          For objects in the current namespace, Unit must be "Amperes".
+          For objects in the power namespace, Unit must be "Watts".
+          For objects in the energy namespace, Unit must be "Joules".
     - name: Scale
       type: int64
       description: >
@@ -48,6 +54,15 @@ enumerations:
         - name: Meters
           description: >
             Length as meters.
+        - name: Amperes
+          description: >
+            Electrical charge flow rate as Amperes.
+        - name: Watts
+          description: >
+            Rate of energy transfer as Watts.
+        - name: Joules
+          description: >
+            Energy transfer as Joules.
 
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
-- 
cgit v1.2.1