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/WFT Baseboard.json b/configurations/WFT Baseboard.json
index d8f16f1..1bb365f 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,152 +1,6 @@
{
"Exposes": [
{
- "Name": "1U System Fan connector 1",
- "Pwm": 0,
- "Status": "disabled",
- "Tachs": [
- 0,
- 1
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "1U System Fan connector 2",
- "Pwm": 1,
- "Status": "disabled",
- "Tachs": [
- 2,
- 3
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "1U System Fan connector 3",
- "Pwm": 2,
- "Status": "disabled",
- "Tachs": [
- 4,
- 5
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "1U System Fan connector 4",
- "Pwm": 3,
- "Status": "disabled",
- "Tachs": [
- 6,
- 7
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "1U System Fan connector 5",
- "Pwm": 4,
- "Status": "disabled",
- "Tachs": [
- 8,
- 9
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "1U System Fan connector 6",
- "Pwm": 5,
- "Status": "disabled",
- "Tachs": [
- 10,
- 11
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 1",
- "Pwm": 0,
- "Status": "disabled",
- "Tachs": [
- 0
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 2",
- "Pwm": 1,
- "Status": "disabled",
- "Tachs": [
- 2
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 3",
- "Pwm": 2,
- "Status": "disabled",
- "Tachs": [
- 4
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 4",
- "Pwm": 3,
- "Status": "disabled",
- "Tachs": [
- 6
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 5",
- "Pwm": 4,
- "Status": "disabled",
- "Tachs": [
- 8
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "2U System Fan connector 6",
- "Pwm": 5,
- "Status": "disabled",
- "Tachs": [
- 10
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Address": "0x4A",
- "Bus": 6,
- "Name": "BMC Temp",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- },
- {
"Index": 0,
"Name": "Baseboard 12 Volt",
"PowerState": "On",
@@ -180,56 +34,6 @@
"Type": "ADC"
},
{
- "Name": "CPU 1 Fan Connector",
- "Pwm": 7,
- "Status": "disabled",
- "Tachs": [
- 13
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "CPU 2 Fan Connector",
- "Pwm": 8,
- "Status": "disabled",
- "Tachs": [
- 14
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Address": "0x49",
- "Bus": 6,
- "Name": "Left Rear Temp",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- },
- {
"Index": 4,
"Name": "P0V83_LAN_AUX",
"Thresholds": [
@@ -389,9 +193,9 @@
"Type": "ADC"
},
{
+ "BridgeGpio": 208,
"Index": 7,
"Name": "P3VBAT",
- "BridgeGpio":208,
"ScaleFactor": 0.3333,
"Thresholds": [
{
@@ -711,199 +515,6 @@
"Type": "ADC"
},
{
- "Address": "0x4D",
- "Bus": 6,
- "Name": "Right Rear Board Temp",
- "Name1": "Right Rear TMP421 Internal Temp",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP421"
- },
- {
- "Address": "0x48",
- "Bus": 6,
- "Name": "Voltage Regulator 1 Temp",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- },
- {
- "Address": "0x4B",
- "Bus": 6,
- "Name": "Voltage Regulator 2 Temp",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- },
- {
- "Address": "0x30",
- "Bus": 0,
- "CpuID": 1,
- "Name": "Skylake CPU 1",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Label": "DIMM",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 99
- },
- {
- "Direction": "greater than",
- "Label": "DIMM",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 89
- }
- ],
- "Type": "SkylakeCPU"
- },
- {
- "Address": "0x31",
- "Bus": 0,
- "CpuID": 2,
- "Name": "Skylake CPU 2",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Label": "DIMM",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 99
- },
- {
- "Direction": "greater than",
- "Label": "DIMM",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 89
- }
- ],
- "Type": "SkylakeCPU"
- },
- {
- "Class": "temp",
- "FFGainCoefficient": 0.0,
- "FFOffCoefficient": 0.0,
- "ICoefficient": -0.1,
- "ILimitMax": 100,
- "ILimitMin": 30,
- "Inputs": [
- "Core \\d+ CPU1"
- ],
- "Name": "CPU1",
- "NegativeHysteresis": 5.0,
- "OutLimitMax": 100,
- "OutLimitMin": 30,
- "Outputs": [],
- "PCoefficient": -0.15,
- "PositiveHysteresis": 0.0,
- "SetPoint": 45.0,
- "SlewNeg": -1,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "Left"
- ]
- },
- {
- "Class": "temp",
- "FFGainCoefficient": 0.0,
- "FFOffCoefficient": 0.0,
- "ICoefficient": -0.1,
- "ILimitMax": 100,
- "ILimitMin": 30,
- "Inputs": [
- "Core \\d+ CPU2"
- ],
- "Name": "CPU2",
- "NegativeHysteresis": 5.0,
- "OutLimitMax": 100,
- "OutLimitMin": 30,
- "Outputs": [],
- "PCoefficient": -0.15,
- "PositiveHysteresis": 0.0,
- "SetPoint": 45.0,
- "SlewNeg": -1,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "Right"
- ]
- },
- {
"Direction": "Input",
"Index": 32,
"Name": "Reset Button",
@@ -1472,104 +1083,136 @@
"Type": "Gpio"
},
{
- "FaultIndex": 0,
- "FaultType": "faultMemory",
- "LedGpioPins": [
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251
+ "Name": "1U System Fan connector 1",
+ "Pwm": 0,
+ "Status": "disabled",
+ "Tachs": [
+ 0,
+ 1
],
- "Name": "CPU1 DIMM FAULT LEDs",
- "Type": "LedFault"
+ "Type": "IntelFanConnector"
},
{
- "FaultIndex": 1,
- "FaultType": "faultMemory",
- "LedGpioPins": [
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271
+ "Name": "1U System Fan connector 2",
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
+ 2,
+ 3
],
- "Name": "CPU2 DIMM FAULT LEDs",
- "Type": "LedFault"
+ "Type": "IntelFanConnector"
},
{
- "FaultIndex": 2,
- "FaultType": "faultMemory",
- "LedGpioPins": [
- 273,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283
+ "Name": "1U System Fan connector 3",
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
+ 4,
+ 5
],
- "Name": "CPU3 DIMM FAULT LEDs",
- "Type": "LedFault"
+ "Type": "IntelFanConnector"
},
{
- "FaultIndex": 3,
- "FaultType": "faultMemory",
- "LedGpioPins": [
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295
+ "Name": "1U System Fan connector 4",
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
+ 6,
+ 7
],
- "Name": "CPU4 DIMM FAULT LEDs",
- "Type": "LedFault"
+ "Type": "IntelFanConnector"
},
{
- "FaultIndex": 0,
- "FaultType": "faultFan",
- "LedGpioPins": [
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259
+ "Name": "1U System Fan connector 5",
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
+ 8,
+ 9
],
- "Name": "Fan FAULT LEDs",
- "Type": "LedFault"
+ "Type": "IntelFanConnector"
},
{
- "Name": "Node Manager Sensor",
- "Type": "NMSensor"
+ "Name": "1U System Fan connector 6",
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
+ 10,
+ 11
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 1",
+ "Pwm": 0,
+ "Status": "disabled",
+ "Tachs": [
+ 0
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 2",
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
+ 2
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 3",
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
+ 4
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 4",
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
+ 6
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 5",
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
+ 8
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "2U System Fan connector 6",
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
+ 10
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "CPU 1 Fan Connector",
+ "Pwm": 7,
+ "Status": "disabled",
+ "Tachs": [
+ 13
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "CPU 2 Fan Connector",
+ "Pwm": 8,
+ "Status": "disabled",
+ "Tachs": [
+ 14
+ ],
+ "Type": "IntelFanConnector"
},
{
"Address": "0x8",
@@ -1893,6 +1536,118 @@
"Type": "IpmbSensor"
},
{
+ "FaultIndex": 0,
+ "FaultType": "faultMemory",
+ "LedGpioPins": [
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251
+ ],
+ "Name": "CPU1 DIMM FAULT LEDs",
+ "Type": "LedFault"
+ },
+ {
+ "FaultIndex": 1,
+ "FaultType": "faultMemory",
+ "LedGpioPins": [
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271
+ ],
+ "Name": "CPU2 DIMM FAULT LEDs",
+ "Type": "LedFault"
+ },
+ {
+ "FaultIndex": 2,
+ "FaultType": "faultMemory",
+ "LedGpioPins": [
+ 273,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283
+ ],
+ "Name": "CPU3 DIMM FAULT LEDs",
+ "Type": "LedFault"
+ },
+ {
+ "FaultIndex": 3,
+ "FaultType": "faultMemory",
+ "LedGpioPins": [
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295
+ ],
+ "Name": "CPU4 DIMM FAULT LEDs",
+ "Type": "LedFault"
+ },
+ {
+ "FaultIndex": 0,
+ "FaultType": "faultFan",
+ "LedGpioPins": [
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259
+ ],
+ "Name": "Fan FAULT LEDs",
+ "Type": "LedFault"
+ },
+ {
+ "Name": "Node Manager Sensor",
+ "Type": "NMSensor"
+ },
+ {
+ "Address": "0x71",
+ "Bus": 2,
+ "ChannelNames": [
+ "M2_Slot1",
+ "M2_Slot2",
+ "",
+ ""
+ ],
+ "Name": "M.2 Mux",
+ "Type": "PCA9543Mux"
+ },
+ {
"Address": "0x70",
"Bus": 4,
"ChannelNames": [
@@ -1965,16 +1720,261 @@
"Type": "PCA9546Mux"
},
{
- "Address": "0x71",
- "Bus": 2,
- "ChannelNames": [
- "M2_Slot1",
- "M2_Slot2",
- "",
- ""
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -0.1,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "Core \\d+ CPU1"
],
- "Name": "M.2 Mux",
- "Type": "PCA9543Mux"
+ "Name": "CPU1",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 45.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "Left"
+ ]
+ },
+ {
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -0.1,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "Core \\d+ CPU2"
+ ],
+ "Name": "CPU2",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 45.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "Right"
+ ]
+ },
+ {
+ "Address": "0x30",
+ "Bus": 0,
+ "CpuID": 1,
+ "Name": "Skylake CPU 1",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "DIMM",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 99
+ },
+ {
+ "Direction": "greater than",
+ "Label": "DIMM",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 89
+ }
+ ],
+ "Type": "SkylakeCPU"
+ },
+ {
+ "Address": "0x31",
+ "Bus": 0,
+ "CpuID": 2,
+ "Name": "Skylake CPU 2",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "DIMM",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 99
+ },
+ {
+ "Direction": "greater than",
+ "Label": "DIMM",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 89
+ }
+ ],
+ "Type": "SkylakeCPU"
+ },
+ {
+ "Address": "0x4D",
+ "Bus": 6,
+ "Name": "Right Rear Board Temp",
+ "Name1": "Right Rear TMP421 Internal Temp",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 110
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 5
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4A",
+ "Bus": 6,
+ "Name": "BMC Temp",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 110
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 5
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP75"
+ },
+ {
+ "Address": "0x49",
+ "Bus": 6,
+ "Name": "Left Rear Temp",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 110
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 5
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP75"
+ },
+ {
+ "Address": "0x48",
+ "Bus": 6,
+ "Name": "Voltage Regulator 1 Temp",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 110
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 5
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP75"
+ },
+ {
+ "Address": "0x4B",
+ "Bus": 6,
+ "Name": "Voltage Regulator 2 Temp",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 110
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 5
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP75"
}
],
"Name": "WFP Baseboard",