Add PWM configurations to Chassis
This should allow redfish to find the Pwms.
Also autojson all the files. Also delete the extra
PWM in PID control.
Change-Id: I0a6e515cd07333b498738d96818c325f0cc2e427
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index d7af315..69eb6aa 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -1,6 +1,30 @@
{
"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": "1U System Fan connector 1",
"Index": 0,
"Name": "Fan 1a",
@@ -274,8 +298,7 @@
"ILimitMin": 0.0,
"Inputs": [
"Fan 2a",
- "Fan 2b",
- "Pwm 2"
+ "Fan 2b"
],
"Name": "Fan 2",
"OutLimitMax": 100.0,
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 4184162..d59f66d 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -1,6 +1,30 @@
{
"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",
"Index": 0,
"Name": "Fan 1",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index c3d64b3..f9b6b30 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -2,7 +2,6 @@
"Exposes": [
{
"Name": "4U System Fan connector 1",
- "present": 0,
"Pwm": 1,
"Status": "disabled",
"Tachs": [
@@ -12,7 +11,6 @@
},
{
"Name": "4U System Fan connector 2",
- "present": 1,
"Pwm": 2,
"Status": "disabled",
"Tachs": [
@@ -22,7 +20,6 @@
},
{
"Name": "4U System Fan connector 3",
- "present": 2,
"Pwm": 3,
"Status": "disabled",
"Tachs": [
@@ -32,7 +29,6 @@
},
{
"Name": "4U System Fan connector 4",
- "present": 3,
"Pwm": 4,
"Status": "disabled",
"Tachs": [
@@ -42,7 +38,6 @@
},
{
"Name": "4U System Fan connector 5",
- "present": 4,
"Pwm": 5,
"Status": "disabled",
"Tachs": [
@@ -52,7 +47,6 @@
},
{
"Name": "4U System Fan connector 6",
- "present": 5,
"Pwm": 6,
"Status": "disabled",
"Tachs": [
@@ -846,4 +840,4 @@
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_PRODUCT_SERIAL_NUMBER"
}
-}
+}
\ No newline at end of file