meta-facebook: yosemite4: add virtual sensors for fans' power
Summary:
Add fans' power that calculated by multiplying Fan board's 48V voltage
and Fan's current together.
Tested:
Check the sensor reading of fans' power are correct.
Change-Id: Idb096ba9513fdce68e165285b8bd94a2ef25985c
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
index fe51488..dc9ce00 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
@@ -1 +1,302 @@
-[]
+[
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN0_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN0_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN1_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN1_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN2_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN2_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN3_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN3_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN4_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN4_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD0_48V_FAN5_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD0_ADC_48V_FAN5_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN0_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN0_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN1_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN1_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN2_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN2_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN3_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN3_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN4_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN4_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ },
+ {
+ "Desc": {
+ "Name": "Virtual_FANBOARD1_48V_FAN5_PWR_W",
+ "SensorType": "power"
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "fan_vol",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_AUX_VOLT_V",
+ "SensorType": "voltage"
+ }
+ },
+ {
+ "ParamName": "fan_curr",
+ "Desc": {
+ "Name": "FANBOARD1_ADC_48V_FAN5_CURR_A",
+ "SensorType": "voltage"
+ }
+ }
+ ]
+ },
+ "Expression": "fan_vol * fan_curr"
+ }
+]
\ No newline at end of file