Update clamps with real I coeffs
Take coeffs from last generation and apply them. Also
autojson.
Change-Id: I21db30c090d7438c912e0a47a4a37bb37bd8470e
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/AXX1P100HSSI_AIC.json b/configurations/AXX1P100HSSI_AIC.json
index 1d7fa7f..9ce4151 100644
--- a/configurations/AXX1P100HSSI_AIC.json
+++ b/configurations/AXX1P100HSSI_AIC.json
@@ -29,4 +29,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
+]
\ No newline at end of file
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 4331ce4..6c8c46f 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -2,6 +2,84 @@
{
"Exposes": [
{
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "PSU$ADDRESS % 4 + 1 FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Fan Speed 1"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -4.64,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Temperature"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 Temperature",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 50.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Temperature"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "$ADDRESS % 4 + 88",
"Bus": "$bus",
"Name": "PSU$ADDRESS % 4 + 1",
@@ -50,57 +128,6 @@
}
],
"Type": "pmbus"
- },
- {
- "Class": "fan",
- "FFGainCoefficient": 0.01,
- "FFOffCoefficient": 0.0,
- "ICoefficient": 0.0,
- "ILimitMax": 0.0,
- "ILimitMin": 0.0,
- "Inputs": [
- "PSU$ADDRESS % 4 + 1 Fan Speed 1"
- ],
- "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
- "NegativeHysteresis": 2.0,
- "OutLimitMax": 100.0,
- "OutLimitMin": 30.0,
- "Outputs": [
- "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
- ],
- "PCoefficient": 0.0,
- "PositiveHysteresis": 0.0,
- "SlewNeg": 0.0,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Class": "Floor",
- "Inputs": [
- "PSU$ADDRESS % 4 + 1 Temperature"
- ],
- "Name": "PSU$ADDRESS % 4 + 1 LCC",
- "NegativeHysteresis": 2,
- "Output": [
- 40.0, 100.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 30.0, 65.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "PSU$ADDRESS % 4 + 1 FRU",
- "Type": "EEPROM"
}
],
"Name": "Delta DPS-750XB PSU$ADDRESS % 4 + 1",
@@ -113,4 +140,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
+]
\ No newline at end of file
diff --git a/configurations/FBTP.json b/configurations/FBTP.json
index 8612294..4171eb9 100644
--- a/configurations/FBTP.json
+++ b/configurations/FBTP.json
@@ -345,6 +345,12 @@
]
},
{
+ "FailSafePercent": 100,
+ "MinThermalOutput": 10,
+ "Name": "Left",
+ "Type": "Pid.Zone"
+ },
+ {
"Class": "temp",
"Inputs": [
"MB_INLET_TEMP"
@@ -577,60 +583,6 @@
]
},
{
- "FailSafePercent": 100,
- "MinThermalOutput": 10,
- "Name": "Left",
- "Type": "Pid.Zone"
- },
- {
- "Address": "0x30",
- "Bus": 0,
- "CpuID": 1,
- "Name": "CPU 1",
- "DtsCritOffset": -2.0,
- "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": "XeonCPU"
- },
- {
- "Address": "0x31",
- "Bus": 0,
- "CpuID": 2,
- "Name": "CPU 2",
- "DtsCritOffset": -2.0,
- "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": "XeonCPU"
- },
- {
"Address": "0x4e",
"Bus": 6,
"Name": "MB_INLET_TEMP",
@@ -674,6 +626,54 @@
}
],
"Type": "TMP421"
+ },
+ {
+ "Address": "0x30",
+ "Bus": 0,
+ "CpuID": 1,
+ "DtsCritOffset": -2.0,
+ "Name": "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": "XeonCPU"
+ },
+ {
+ "Address": "0x31",
+ "Bus": 0,
+ "CpuID": 2,
+ "DtsCritOffset": -2.0,
+ "Name": "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": "XeonCPU"
}
],
"Name": "TiogaPass Baseboard",
@@ -685,4 +685,4 @@
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
-}
+}
\ No newline at end of file
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 2a05b90..3c63395 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -34,6 +34,31 @@
]
},
{
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -4.64,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Temperature"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 Temperature",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 50.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Class": "Floor",
"Inputs": [
"PSU$ADDRESS % 4 + 1 Temperature"
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index b8206c3..2b7d8c6 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -2,6 +2,59 @@
{
"Exposes": [
{
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Solum 1300W PSU$ADDRESS % 4 + 1 FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Fan Speed 1"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Temperature"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "$ADDRESS % 4 + 88",
"Bus": "$bus",
"Name": "PSU$ADDRESS % 4 + 1",
@@ -50,57 +103,6 @@
}
],
"Type": "pmbus"
- },
- {
- "Class": "fan",
- "FFGainCoefficient": 0.01,
- "FFOffCoefficient": 0.0,
- "ICoefficient": 0.0,
- "ILimitMax": 0.0,
- "ILimitMin": 0.0,
- "Inputs": [
- "PSU$ADDRESS % 4 + 1 Fan Speed 1"
- ],
- "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
- "NegativeHysteresis": 2.0,
- "OutLimitMax": 100.0,
- "OutLimitMin": 30.0,
- "Outputs": [
- "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
- ],
- "PCoefficient": 0.0,
- "PositiveHysteresis": 0.0,
- "SlewNeg": 0.0,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Class": "Floor",
- "Inputs": [
- "PSU$ADDRESS % 4 + 1 Temperature"
- ],
- "Name": "PSU$ADDRESS % 4 + 1 LCC",
- "NegativeHysteresis": 2,
- "Output": [
- 40.0, 100.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 30.0, 65.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "Solum 1300W PSU$ADDRESS % 4 + 1 FRU",
- "Type": "EEPROM"
}
],
"Name": "Solum 1300W PSU$ADDRESS % 4 + 1",
@@ -113,4 +115,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF222201A.json b/configurations/PSSF222201A.json
index 6c17aa5..e962b62 100644
--- a/configurations/PSSF222201A.json
+++ b/configurations/PSSF222201A.json
@@ -115,4 +115,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
+]
\ No newline at end of file
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 2320a01..21fd45e 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -308,7 +308,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -321,7 +321,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 75.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index c0a0f5d..02367fe 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -350,7 +350,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -363,7 +363,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 75.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index 1a533df..254160a 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -14,4 +14,4 @@
],
"Name": "SAS Module",
"Probe": "FALSE"
-}
+}
\ No newline at end of file
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 15d2efb..4b49e2c 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -34,6 +34,31 @@
]
},
{
+ "Class": "temp",
+ "FFGainCoefficient": 0.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": -4.64,
+ "ILimitMax": 100,
+ "ILimitMin": 30,
+ "Inputs": [
+ "PSU$ADDRESS % 4 + 1 Temperature"
+ ],
+ "Name": "PSU$ADDRESS % 4 + 1 Temperature",
+ "NegativeHysteresis": 5.0,
+ "OutLimitMax": 100,
+ "OutLimitMin": 30,
+ "Outputs": [],
+ "PCoefficient": -0.15,
+ "PositiveHysteresis": 0.0,
+ "SetPoint": 50.0,
+ "SlewNeg": -1,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Class": "Floor",
"Inputs": [
"PSU$ADDRESS % 4 + 1 Temperature"
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index b2dae9a..7a74a70 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -607,50 +607,6 @@
"Type": "IntelFanConnector"
},
{
- "Address": "0x30",
- "CpuID": 1,
- "Name": "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": "XeonCPU"
- },
- {
- "Address": "0x31",
- "CpuID": 2,
- "Name": "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": "XeonCPU"
- },
- {
"Address": "0x4C",
"Bus": 6,
"Name": "BMC Temp",
@@ -842,16 +798,60 @@
}
],
"Type": "TMP75"
+ },
+ {
+ "Address": "0x30",
+ "CpuID": 1,
+ "Name": "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": "XeonCPU"
+ },
+ {
+ "Address": "0x31",
+ "CpuID": 2,
+ "Name": "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": "XeonCPU"
}
],
"Name": "STP Baseboard",
"Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
- "Type": "Board",
"ProductId": 125,
+ "Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
"Model": "$PRODUCT_PRODUCT_NAME",
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
-}
+}
\ No newline at end of file
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index cae8b36..2a4f07f 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1674,7 +1674,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1687,7 +1687,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 80.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1701,7 +1701,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1728,7 +1728,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1754,7 +1754,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1781,7 +1781,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1808,7 +1808,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1835,7 +1835,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1863,7 +1863,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -8.8,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1876,7 +1876,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 55.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1890,7 +1890,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -8.8,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1903,7 +1903,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 55.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1917,7 +1917,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -4.64,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1930,7 +1930,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 76.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1944,7 +1944,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -8.8,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1957,7 +1957,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 90.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1971,7 +1971,7 @@
"Class": "temp",
"FFGainCoefficient": 0.0,
"FFOffCoefficient": 0.0,
- "ICoefficient": -1.0,
+ "ICoefficient": -8.8,
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
@@ -1984,7 +1984,7 @@
"Outputs": [],
"PCoefficient": -0.15,
"PositiveHysteresis": 0.0,
- "SetPoint": 60.0,
+ "SetPoint": 90.0,
"SlewNeg": -1,
"SlewPos": 0.0,
"Type": "Pid",
@@ -1996,52 +1996,6 @@
]
},
{
- "Address": "0x30",
- "Bus": 0,
- "CpuID": 1,
- "Name": "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": "XeonCPU"
- },
- {
- "Address": "0x31",
- "Bus": 0,
- "CpuID": 2,
- "Name": "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": "XeonCPU"
- },
- {
"Address": "0x4D",
"Bus": 6,
"Name": "Right Rear Board Temp",
@@ -2201,12 +2155,58 @@
}
],
"Type": "TMP75"
+ },
+ {
+ "Address": "0x30",
+ "Bus": 0,
+ "CpuID": 1,
+ "Name": "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": "XeonCPU"
+ },
+ {
+ "Address": "0x31",
+ "Bus": 0,
+ "CpuID": 2,
+ "Name": "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": "XeonCPU"
}
],
"Name": "WFP Baseboard",
"Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
- "Type": "Board",
"ProductId": 123,
+ "Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
"Model": "$PRODUCT_PRODUCT_NAME",