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/STP Baseboard.json b/configurations/STP Baseboard.json
index 769bee9..79d1da2 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -1,280 +1,6 @@
{
"Exposes": [
{
- "Name": "4U System Fan connector 1",
- "Pwm": 1,
- "Status": "disabled",
- "Tachs": [
- 1
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 2",
- "Pwm": 2,
- "Status": "disabled",
- "Tachs": [
- 2
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 3",
- "Pwm": 3,
- "Status": "disabled",
- "Tachs": [
- 3
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 4",
- "Pwm": 4,
- "Status": "disabled",
- "Tachs": [
- 4
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 5",
- "Pwm": 5,
- "Status": "disabled",
- "Tachs": [
- 5
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 6",
- "Pwm": 6,
- "Status": "disabled",
- "Tachs": [
- 6
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U CPU 1 fan connector",
- "Pwm": 7,
- "Status": "disabled",
- "Tachs": [
- 7
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U CPU 2 fan connector",
- "Pwm": 8,
- "Status": "disabled",
- "Tachs": [
- 8
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Name": "4U System Fan connector 7",
- "Pwm": 9,
- "Status": "disabled",
- "Tachs": [
- 9
- ],
- "Type": "IntelFanConnector"
- },
- {
- "Address": "0x48",
- "Bus": 6,
- "Name": "M_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": "0x4F",
- "Bus": 6,
- "Name": "Memory VRM 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": "0x4E",
- "Bus": 6,
- "Name": "LR Memory Board 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": "0x4C",
- "Bus": 6,
- "Name": "BMC Temp",
- "Name1": "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": "0x49",
- "Bus": 6,
- "Name": "CPU VR 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": "0x4D",
- "Bus": 6,
- "Name": "Ambient 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": "PSU 12 Volt",
"ScaleFactor": 0.1124,
@@ -787,6 +513,100 @@
"Type": "ADC"
},
{
+ "BindGpioIntrusion": "Chassis Intrusion GPIO",
+ "Class": "Gpio",
+ "Name": "Chassis Intrusion Sensor",
+ "Type": "ChassisIntrusionSensor"
+ },
+ {
+ "Direction": "Input",
+ "Index": 143,
+ "Name": "Chassis Intrusion GPIO",
+ "Polarity": "Low",
+ "Type": "Gpio"
+ },
+ {
+ "Name": "4U System Fan connector 1",
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
+ 1
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 2",
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
+ 2
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 3",
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
+ 3
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 4",
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
+ 4
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 5",
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
+ 5
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 6",
+ "Pwm": 6,
+ "Status": "disabled",
+ "Tachs": [
+ 6
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U CPU 1 fan connector",
+ "Pwm": 7,
+ "Status": "disabled",
+ "Tachs": [
+ 7
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U CPU 2 fan connector",
+ "Pwm": 8,
+ "Status": "disabled",
+ "Tachs": [
+ 8
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "4U System Fan connector 7",
+ "Pwm": 9,
+ "Status": "disabled",
+ "Tachs": [
+ 9
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
"Address": "0x30",
"CpuID": 1,
"Name": "Skylake CPU 1",
@@ -831,17 +651,197 @@
"Type": "SkylakeCPU"
},
{
- "Direction": "Input",
- "Index": 143,
- "Polarity": "Low",
- "Name": "Chassis Intrusion GPIO",
- "Type": "Gpio"
+ "Address": "0x4C",
+ "Bus": 6,
+ "Name": "BMC Temp",
+ "Name1": "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"
},
{
- "Class": "Gpio",
- "BindGpioIntrusion": "Chassis Intrusion GPIO",
- "Name": "Chassis Intrusion Sensor",
- "Type": "ChassisIntrusionSensor"
+ "Address": "0x48",
+ "Bus": 6,
+ "Name": "M_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": "0x4F",
+ "Bus": 6,
+ "Name": "Memory VRM 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": "0x4E",
+ "Bus": 6,
+ "Name": "LR Memory Board 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": "CPU VR 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": "0x4D",
+ "Bus": 6,
+ "Name": "Ambient 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": "STP Baseboard",