From ea821dee0f5e0a9082ee2febebe694cad079d82a Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Tue, 10 Nov 2020 09:11:44 -0600 Subject: rainier: Add a virtual ambient temp sensor Use the virtual-sensor application to put a virtual ambient temperature sensor on D-Bus. Currently, it just mirrors the value of the TMP275 ambient temperature sensor, but in the future the output will be based on all three temp sensors on the panel after the remaining two show up on D-Bus. (From meta-ibm rev: f43eab1e5637cf87a38ca2e9a6acc33e5db3a0c3) Signed-off-by: Matt Spinler Change-Id: I187d88c7e1245c7014aee8b9b6c0840daf1e622d Signed-off-by: Andrew Geissler --- .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- .../rainier/virtual_sensor_config.json | 24 ++++++++++++++++++++++ .../sensors/phosphor-virtual-sensor_%.bbappend | 6 ++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 2720e46823..7bd2dc285c 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -24,7 +24,7 @@ RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-contr RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} webui-vue dbus-sensors" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} webui-vue dbus-sensors phosphor-virtual-sensor" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json new file mode 100644 index 0000000000..6458836fdd --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json @@ -0,0 +1,24 @@ +[ + { + "Desc": + { + "Name": "Ambient_Virtual_Temp", + "SensorType": "temperature" + }, + "Params": + { + "DbusParam": + [ + { + "ParamName": "T0", + "Desc": + { + "Name": "Ambient_0_Temp", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "T0" + } +] diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..53f8905be9 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://virtual_sensor_config.json" + +do_install_append_rainier() { + install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ +} -- cgit v1.2.3