Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

1 files changed, 51 insertions, 0 deletions

diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json
new file mode 100644
index 000000000..c56712dbd
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json
@@ -0,0 +1,51 @@
+[
+  {
+		"Desc" :
+		{
+			"Name" : "Virtual_CFM_Sensor",
+			"SensorType" : "airflow"
+		},
+		"Threshold" :
+		{
+			"CriticalHigh": 40,
+			"CriticalLow": 10,
+			"WarningHigh": 30,
+			"WarningLow": 15
+		},
+		"Params":
+		{
+			"ConstParam" :
+			[
+				{
+					"ParamName" : "P1",
+					"Value" : 0.00565
+				},
+				{
+					"ParamName" : "P2",
+					"Value" : 3.7427
+				}
+			],
+			"DbusParam" :
+			[
+				{
+					"ParamName" : "P3",
+					"Desc" :
+					{
+						"Name" : "SP_FAN0_TACH",
+						"SensorType" : "fan_tach"
+					}
+				},
+				{
+					"ParamName" : "P4",
+					"Desc" :
+					{
+						"Name" : "SP_FAN1_TACH",
+						"SensorType" : "fan_tach"
+					}
+				}
+			]
+		},
+		"Expression" : "(P3 * P1) + (P4 * P1) - P2"
+	}
+]
+