Sort Exposes Alphabetically By Type
This makes it much easier to find components of
a specific type because they will be grouped together.
Tested: Sensor list was still the same
Change-Id: Iab15be34e003be1aac120864c18a80eaaa9b391c
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index e5fbc8b..42dac8d 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -1,30 +1,6 @@
{
"Exposes": [
{
- "Name": "Pwm 1",
- "Type": "Pwm"
- },
- {
- "Name": "Pwm 2",
- "Type": "Pwm"
- },
- {
- "Name": "Pwm 3",
- "Type": "Pwm"
- },
- {
- "Name": "Pwm 4",
- "Type": "Pwm"
- },
- {
- "Name": "Pwm 5",
- "Type": "Pwm"
- },
- {
- "Name": "Pwm 6",
- "Type": "Pwm"
- },
- {
"BindConnector": "2U System Fan connector 1",
"BindPresence": "Fan 0 Present",
"Index": 0,
@@ -157,6 +133,53 @@
"Type": "AspeedFan"
},
{
+ "C1": 53.76,
+ "C2": 53.76,
+ "MaxCFM": 71,
+ "Name": "System Airflow",
+ "TachMaxPercent": 100,
+ "TachMinPercent": 20,
+ "Tachs": [
+ "Fan 1",
+ "Fan 2",
+ "Fan 3",
+ "Fan 4",
+ "Fan 5",
+ "Fan 6"
+ ],
+ "Type": "CFMSensor"
+ },
+ {
+ "AlphaF": 4.352,
+ "AlphaS": 0.512,
+ "Name": "Exit Air Temp",
+ "PowerFactorMax": 12,
+ "PowerFactorMin": 9,
+ "QMax": 165,
+ "QMin": 31,
+ "Type": "ExitAirTempSensor"
+ },
+ {
+ "Controllers": [
+ ".*"
+ ],
+ "Name": "Acoustic",
+ "Type": "FanProfile"
+ },
+ {
+ "Controllers": [
+ "Front Panel LCC",
+ "CPU\\d"
+ ],
+ "Name": "Performance",
+ "Type": "FanProfile"
+ },
+ {
+ "AllowedFailures": 1,
+ "Name": "FanRedundancy",
+ "Type": "FanRedundancy"
+ },
+ {
"Class": "fan",
"FFGainCoefficient": 1.0,
"FFOffCoefficient": 0.0,
@@ -313,6 +336,68 @@
]
},
{
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -1.0,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "Exit Air Temp"
+ ],
+ "Name": "Exit Air Temp",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 70.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "Left",
+ "Right"
+ ]
+ },
+ {
+ "FailSafePercent": 100,
+ "MinThermalOutput": 30,
+ "Name": "Left",
+ "Type": "Pid.Zone"
+ },
+ {
+ "FailSafePercent": 100,
+ "MinThermalOutput": 30,
+ "Name": "Right",
+ "Type": "Pid.Zone"
+ },
+ {
+ "Name": "Pwm 1",
+ "Type": "Pwm"
+ },
+ {
+ "Name": "Pwm 2",
+ "Type": "Pwm"
+ },
+ {
+ "Name": "Pwm 3",
+ "Type": "Pwm"
+ },
+ {
+ "Name": "Pwm 4",
+ "Type": "Pwm"
+ },
+ {
+ "Name": "Pwm 5",
+ "Type": "Pwm"
+ },
+ {
+ "Name": "Pwm 6",
+ "Type": "Pwm"
+ },
+ {
"Class": "Floor",
"Inputs": [
"Front Panel Temp"
@@ -355,101 +440,16 @@
"Left",
"Right"
]
- },
- {
- "FailSafePercent": 100,
- "MinThermalOutput": 30,
- "Name": "Left",
- "Type": "Pid.Zone"
- },
- {
- "FailSafePercent": 100,
- "MinThermalOutput": 30,
- "Name": "Right",
- "Type": "Pid.Zone"
- },
- {
- "AllowedFailures": 1,
- "Name": "FanRedundancy",
- "Type": "FanRedundancy"
- },
- {
- "AlphaF": 4.352,
- "AlphaS": 0.512,
- "Name": "Exit Air Temp",
- "PowerFactorMax": 12,
- "PowerFactorMin": 9,
- "QMax": 165,
- "QMin": 31,
- "Type": "ExitAirTempSensor"
- },
- {
- "Class": "temp",
- "FFGainCoefficient": 0.0,
- "FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
- "ILimitMax": 100,
- "ILimitMin": 30,
- "Inputs": [
- "Exit Air Temp"
- ],
- "Name": "Exit Air Temp",
- "NegativeHysteresis": 5.0,
- "OutLimitMax": 100,
- "OutLimitMin": 30,
- "Outputs": [],
- "PCoefficient": -0.15,
- "PositiveHysteresis": 0.0,
- "SetPoint": 70.0,
- "SlewNeg": -1,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "Left",
- "Right"
- ]
- },
- {
- "C1": 53.76,
- "C2": 53.76,
- "MaxCFM": 71,
- "Name": "System Airflow",
- "TachMaxPercent": 100,
- "TachMinPercent": 20,
- "Tachs": [
- "Fan 1",
- "Fan 2",
- "Fan 3",
- "Fan 4",
- "Fan 5",
- "Fan 6"
- ],
- "Type": "CFMSensor"
- },
- {
- "Controllers": [
- ".*"
- ],
- "Name": "Acoustic",
- "Type": "FanProfile"
- },
- {
- "Controllers": [
- "Front Panel LCC",
- "CPU\\d"
- ],
- "Name": "Performance",
- "Type": "FanProfile"
}
],
"Name": "R2000 Chassis",
- "Type": "Chassis",
"Probe": [
"FOUND('WFP Baseboard')",
"AND",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
"MATCH_ONE"
],
+ "Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "Intel Corporation",
"Model": "R2000",