IBS:pid-control config move 2 entity-manager

1 files changed, 257 insertions, 10 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
index 96b3df5773..cdc59f88fd 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
@@ -62,13 +62,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -100,13 +100,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -138,13 +138,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -176,13 +176,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 8000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 7000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -214,13 +214,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 8000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 7000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -237,6 +237,253 @@
                 ]
             },
             {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 1"               
+            ],
+            "Name": "System Fan 1 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_1"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan1Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 2"               
+            ],
+            "Name": "System Fan 2 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_5"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan2Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 3"               
+            ],
+            "Name": "System Fan 3 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_6"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan3Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "CPU1 Fan"               
+            ],
+            "Name": "CPU Fan 1 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_7"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "CPUFan1Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "CPU2 Fan"               
+            ],
+            "Name": "CPU Fan 2 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_8"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "CPUFan2Zone"
+            ]
+        },            
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan1Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan2Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan3Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "CPUFan1Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "CPUFan2Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "BMC_Temp", "CPUs_Temp", "PCH___M_2_Temp"
+            ],
+            "Name": "Zone 1 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "SysFan1Zone", "SysFan2Zone", "SysFan3Zone"             
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "Die_CPU1"
+            ],
+            "Name": "CPU Zone 1 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "CPUFan1Zone"             
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "Die_CPU2"
+            ],
+            "Name": "CPU Zone 2 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "CPUFan2Zone"             
+            ]
+        },
+        {
                 "Address": "0x4f",
                 "Bus": 6,
                 "Name": "Right side of the board Temp",