diff --git a/.gitignore b/.gitignore index b7c3a2ce..6be2471e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ build*/* subprojects/* !subprojects/*.wrap -subprojects/phosphor-dbus-interfaces.wrap !subprojects/.clang-tidy !subprojects/.clang-format diff --git a/OWNERS b/OWNERS index 29ccc0df..147d72a5 100644 --- a/OWNERS +++ b/OWNERS @@ -38,6 +38,7 @@ owners: - zhikui.ren@intel.com reviewers: +- christopher.sides@hpe.com matchers: @@ -54,3 +55,6 @@ openbmc: - name: Zhikui Ren email: zhikui.ren@intel.com discord: Zhikui +- name: Christopher Sides + email: christopher.sides@hpe.com + discord: citysides diff --git a/configurations/catalina_hdd.json b/configurations/catalina_hdd.json index bd098058..dd05e4a5 100644 --- a/configurations/catalina_hdd.json +++ b/configurations/catalina_hdd.json @@ -15,6 +15,7 @@ "power1" ], "Name": "HDDBOARD_SSD0_INA230", + "PowerState": "On", "Thresholds": [ { "Direction": "greater than", @@ -45,6 +46,7 @@ "power1" ], "Name": "HDDBOARD_SSD1_INA230", + "PowerState": "On", "Thresholds": [ { "Direction": "greater than", @@ -75,6 +77,7 @@ "power1" ], "Name": "HDDBOARD_SSD2_INA230", + "PowerState": "On", "Thresholds": [ { "Direction": "greater than", @@ -105,6 +108,7 @@ "power1" ], "Name": "HDDBOARD_SSD3_INA230", + "PowerState": "On", "Thresholds": [ { "Direction": "greater than", diff --git a/configurations/harma_mb.json b/configurations/harma_mb.json index 97a29cdf..875d6f4c 100644 --- a/configurations/harma_mb.json +++ b/configurations/harma_mb.json @@ -724,7 +724,11 @@ ], "Type": "MP5990", "iout1_Name": "MB_HSC_CURR_A", + "iout1_Offset": 0.41, + "iout1_Scale": 1010, "pin_Name": "MB_HSC_PWR_W", + "pin_Offset": 6.42, + "pin_Scale": 1010101, "temp1_Name": "MB_HSC_TEMP_C", "vin_Name": "MB_HSC_VIN_VOLT_V", "vout1_Name": "MB_HSC_VOUT_VOLT_V" diff --git a/configurations/minerva_cmm.json b/configurations/minerva_cmm.json index cbb55e9e..04cef973 100644 --- a/configurations/minerva_cmm.json +++ b/configurations/minerva_cmm.json @@ -214,10 +214,8 @@ ], "Type": "LTC4287", "iout1_Name": "CMM_HSC_CURR_A", - "iout1_Offset": -0.315, "iout1_Scale": 1010, "pin_Name": "CMM_HSC_PWR_W", - "pin_Offset": -16.8408, "pin_Scale": 1010101, "vin_Name": "CMM_HSC_VIN_VOLT_V", "vout1_Name": "CMM_HSC_VOUT_VOLT_V" @@ -261,6 +259,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 1 + }, "xyz.openbmc_project.Inventory.Item.NetworkInterface": { "MACAddress": "$CHASSIS_INFO_AM2" } diff --git a/configurations/minerva_cmm_hsc_infineon.json b/configurations/minerva_cmm_hsc_infineon.json index 0093c9f9..feb98db8 100644 --- a/configurations/minerva_cmm_hsc_infineon.json +++ b/configurations/minerva_cmm_hsc_infineon.json @@ -261,6 +261,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 1 + }, "xyz.openbmc_project.Inventory.Item.NetworkInterface": { "MACAddress": "$CHASSIS_INFO_AM2" } diff --git a/configurations/minerva_fanboard.json b/configurations/minerva_fanboard.json index b801a692..b96aee4b 100644 --- a/configurations/minerva_fanboard.json +++ b/configurations/minerva_fanboard.json @@ -26,7 +26,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -56,7 +56,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -86,7 +86,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -116,7 +116,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -146,7 +146,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -176,7 +176,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -206,7 +206,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -236,7 +236,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -269,7 +269,7 @@ "Label": "curr1", "Name": "upper critical", "Severity": 1, - "Value": 1.19 + "Value": 7.0 } ], "Type": "INA238", @@ -452,7 +452,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -482,7 +482,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -512,7 +512,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -542,7 +542,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -572,7 +572,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -602,7 +602,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -632,7 +632,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -662,7 +662,7 @@ "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1000 + "Value": 800 } ], "Type": "I2CFan" @@ -695,7 +695,7 @@ "Label": "curr1", "Name": "upper critical", "Severity": 1, - "Value": 1.19 + "Value": 7 } ], "Type": "INA238", diff --git a/configurations/minerva_pdb.json b/configurations/minerva_pdb.json index a8bd425a..cf88f4c9 100644 --- a/configurations/minerva_pdb.json +++ b/configurations/minerva_pdb.json @@ -71,7 +71,11 @@ ], "Type": "LTC4287", "iout1_Name": "PDB_HSC_CURR_A", + "iout1_Offset": -0.5496, + "iout1_Scale": 1070, "pin_Name": "PDB_HSC_PWR_W", + "pin_Offset": -16, + "pin_Scale": 1073883, "temp1_Name": "PDB_HSC_TEMP_C", "vin_Name": "PDB_HSC_VIN_VOLT_V", "vout1_Name": "PDB_HSC_VOUT_VOLT_V" diff --git a/configurations/mtjade.json b/configurations/mtjade.json index 25088237..c78ef359 100644 --- a/configurations/mtjade.json +++ b/configurations/mtjade.json @@ -1056,6 +1056,100 @@ "Name": "MB Upstream Port", "Type": "MB Upstream Port" }, + { + "Name": "S0_DIMMG0_Temp", + "Sensors": [ + "S0_DIMM_CH0_Temp", + "S0_DIMM_CH1_Temp", + "S0_DIMM_CH2_Temp", + "S0_DIMM_CH3_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "Name": "S1_DIMMG0_Temp", + "Sensors": [ + "S1_DIMM_CH0_Temp", + "S1_DIMM_CH1_Temp", + "S1_DIMM_CH2_Temp", + "S1_DIMM_CH3_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "Name": "S0_DIMMG1_Temp", + "Sensors": [ + "S0_DIMM_CH4_Temp", + "S0_DIMM_CH5_Temp", + "S0_DIMM_CH6_Temp", + "S0_DIMM_CH7_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "Name": "S1_DIMMG1_Temp", + "Sensors": [ + "S1_DIMM_CH4_Temp", + "S1_DIMM_CH5_Temp", + "S1_DIMM_CH6_Temp", + "S1_DIMM_CH7_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "Name": "S0_DIMM_DDR_Volt", + "Sensors": [ + "S0_DIMM_VR1_Volt", + "S0_DIMM_VR2_Volt" + ], + "Type": "Maximum", + "Units": "Volts" + }, + { + "Name": "S1_DIMM_DDR_Volt", + "Sensors": [ + "S1_DIMM_VR1_Volt", + "S1_DIMM_VR2_Volt" + ], + "Type": "Maximum", + "Units": "Volts" + }, { "Name": "nvme_bp_max", "Sensors": [ @@ -1410,6 +1504,417 @@ "temp1_Name": "PSU1_TEMP", "vin_Name": "PSU1_VINPUT", "vout1_Name": "PSU1_VOUTPUT" + }, + { + "Address": "0x4f", + "Bus": 2, + "CPURequired": 0, + "Labels": [ + "temp1", + "temp2", + "temp3", + "temp4", + "temp5", + "temp6", + "temp7", + "temp8", + "temp9", + "temp10", + "temp11", + "temp12", + "temp13", + "power1", + "power2", + "power3", + "power4", + "power5", + "vout0", + "vout1", + "vout2", + "vout3", + "vout4", + "iout1", + "iout2", + "iout3", + "iout4", + "iout5" + ], + "Name": "CPU0", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp2", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp3", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp4", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "power3", + "Name": "upper critical", + "Severity": 1, + "Value": 79.95 + }, + { + "Direction": "greater than", + "Label": "power4", + "Name": "upper critical", + "Severity": 1, + "Value": 79.95 + }, + { + "Direction": "greater than", + "Label": "vout0", + "Name": "upper critical", + "Severity": 1, + "Value": 2.0 + }, + { + "Direction": "less than", + "Label": "vout0", + "Name": "lower critical", + "Severity": 1, + "Value": 0.72 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 0.96 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0.56 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 1.141 + }, + { + "Direction": "greater than", + "Label": "vout3", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "less than", + "Label": "vout3", + "Name": "lower critical", + "Severity": 1, + "Value": 1.141 + } + ], + "Type": "smpro_hwmon", + "iout1_Max": 100, + "iout1_Name": "S0_Core_VRD_Curr", + "iout1_Scale": 1, + "iout2_Max": 100, + "iout2_Name": "S0_SOC_VRD_Curr", + "iout2_Scale": 1, + "iout3_Max": 100, + "iout3_Name": "S0_DIMM_VR1_Curr", + "iout3_Scale": 1, + "iout4_Max": 100, + "iout4_Name": "S0_DIMM_VR2_Curr", + "iout4_Scale": 1, + "iout5_Max": 100, + "iout5_Name": "S0_RCA_VRD_Curr", + "iout5_Scale": 1, + "power1_Max": 200, + "power1_Name": "S0_Core_VRD_Pwr", + "power2_Max": 200, + "power2_Name": "S0_SOC_VRD_Pwr", + "power3_Max": 200, + "power3_Name": "S0_DIMM_VR1_Pwr", + "power4_Max": 200, + "power4_Name": "S0_DIMM_VR2_Pwr", + "power5_Max": 200, + "power5_Name": "S0_RCA_VR_Pwr", + "temp10_Max": 255, + "temp10_Min": 0, + "temp10_Name": "S0_DIMM_CH5_Temp", + "temp11_Max": 255, + "temp11_Min": 0, + "temp11_Name": "S0_DIMM_CH6_Temp", + "temp12_Max": 255, + "temp12_Min": 0, + "temp12_Name": "S0_DIMM_CH7_Temp", + "temp13_Max": 255, + "temp13_Min": 0, + "temp13_Name": "S0_RCA_VR_Temp", + "temp1_Max": 255, + "temp1_Min": 0, + "temp1_Name": "S0_SOC_Temp", + "temp2_Max": 255, + "temp2_Min": 0, + "temp2_Name": "S0_SOC_VRD_Temp", + "temp3_Max": 255, + "temp3_Min": 0, + "temp3_Name": "S0_DIMM_VRD_Temp", + "temp4_Max": 255, + "temp4_Min": 0, + "temp4_Name": "S0_Core_VRD_Temp", + "temp5_Max": 255, + "temp5_Min": 0, + "temp5_Name": "S0_DIMM_CH0_Temp", + "temp6_Max": 255, + "temp6_Min": 0, + "temp6_Name": "S0_DIMM_CH1_Temp", + "temp7_Max": 255, + "temp7_Min": 0, + "temp7_Name": "S0_DIMM_CH2_Temp", + "temp8_Max": 255, + "temp8_Min": 0, + "temp8_Name": "S0_DIMM_CH3_Temp", + "temp9_Max": 255, + "temp9_Min": 0, + "temp9_Name": "S0_DIMM_CH4_Temp", + "vout0_Max": 100, + "vout0_Name": "S0_CPU_VCORE", + "vout1_Max": 100, + "vout1_Name": "S0_SOC_Volt", + "vout2_Max": 100, + "vout2_Name": "S0_DIMM_VR1_Volt", + "vout3_Max": 100, + "vout3_Name": "S0_DIMM_VR2_Volt", + "vout4_Max": 100, + "vout4_Name": "S0_RCA_VR_Volt" + }, + { + "Address": "0x4e", + "Bus": 2, + "CPURequired": 1, + "Labels": [ + "temp1", + "temp2", + "temp3", + "temp4", + "temp5", + "temp6", + "temp7", + "temp8", + "temp9", + "temp10", + "temp11", + "temp12", + "temp13", + "power1", + "power2", + "power3", + "power4", + "power5", + "vout0", + "vout1", + "vout2", + "vout3", + "vout4", + "iout1", + "iout2", + "iout3", + "iout4", + "iout5" + ], + "Name": "CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp2", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp3", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "temp4", + "Name": "upper critical", + "Severity": 1, + "Value": 105 + }, + { + "Direction": "greater than", + "Label": "power3", + "Name": "upper critical", + "Severity": 1, + "Value": 79.95 + }, + { + "Direction": "greater than", + "Label": "power4", + "Name": "upper critical", + "Severity": 1, + "Value": 79.95 + }, + { + "Direction": "greater than", + "Label": "vout0", + "Name": "upper critical", + "Severity": 1, + "Value": 2.0 + }, + { + "Direction": "less than", + "Label": "vout0", + "Name": "lower critical", + "Severity": 1, + "Value": 0.72 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 0.96 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 0.56 + }, + { + "Direction": "greater than", + "Label": "vout2", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "less than", + "Label": "vout2", + "Name": "lower critical", + "Severity": 1, + "Value": 1.141 + }, + { + "Direction": "greater than", + "Label": "vout3", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "less than", + "Label": "vout3", + "Name": "lower critical", + "Severity": 1, + "Value": 1.141 + } + ], + "Type": "smpro_hwmon", + "iout1_Max": 100, + "iout1_Name": "S1_Core_VRD_Curr", + "iout1_Scale": 1, + "iout2_Max": 100, + "iout2_Name": "S1_SOC_VRD_Curr", + "iout2_Scale": 1, + "iout3_Max": 100, + "iout3_Name": "S1_DIMM_VR1_Curr", + "iout3_Scale": 1, + "iout4_Max": 100, + "iout4_Name": "S1_DIMM_VR2_Curr", + "iout4_Scale": 1, + "iout5_Max": 100, + "iout5_Name": "S1_RCA_VRD_Curr", + "iout5_Scale": 1, + "power1_Max": 200, + "power1_Name": "S1_Core_VRD_Pwr", + "power2_Max": 200, + "power2_Name": "S1_SOC_VRD_Pwr", + "power3_Max": 200, + "power3_Name": "S1_DIMM_VR1_Pwr", + "power4_Max": 200, + "power4_Name": "S1_DIMM_VR2_Pwr", + "power5_Max": 200, + "power5_Name": "S1_RCA_VR_Pwr", + "temp10_Max": 255, + "temp10_Name": "S1_DIMM_CH5_Temp", + "temp11_Max": 255, + "temp11_Name": "S1_DIMM_CH6_Temp", + "temp12_Max": 255, + "temp12_Name": "S1_DIMM_CH7_Temp", + "temp13_Max": 255, + "temp13_Name": "S1_RCA_VR_Temp", + "temp1_Max": 255, + "temp1_Name": "S1_SOC_Temp", + "temp2_Max": 255, + "temp2_Name": "S1_SOC_VRD_Temp", + "temp3_Max": 255, + "temp3_Name": "S1_DIMM_VRD_Temp", + "temp4_Max": 255, + "temp4_Name": "S1_Core_VRD_Temp", + "temp5_Max": 255, + "temp5_Name": "S1_DIMM_CH0_Temp", + "temp6_Max": 255, + "temp6_Name": "S1_DIMM_CH1_Temp", + "temp7_Max": 255, + "temp7_Name": "S1_DIMM_CH2_Temp", + "temp8_Max": 255, + "temp8_Name": "S1_DIMM_CH3_Temp", + "temp9_Max": 255, + "temp9_Name": "S1_DIMM_CH4_Temp", + "vout0_Max": 100, + "vout0_Name": "S1_CPU_VCORE", + "vout1_Max": 100, + "vout1_Name": "S1_SOC_Volt", + "vout2_Max": 100, + "vout2_Name": "S1_DIMM_VR1_Volt", + "vout3_Max": 100, + "vout3_Name": "S1_DIMM_VR2_Volt", + "vout4_Max": 100, + "vout4_Name": "S1_RCA_VR_Volt" } ], "Name": "Mt.Jade", @@ -1440,5 +1945,37 @@ "MACAddress": "$BOARD_INFO_AM1" }, "xyz.openbmc_project.Inventory.Item.System": {} + }, + { + "Exposes": [ + { + "ConnectsToType": "MB Upstream Port", + "Name": "PowerSupply$ADDRESS % 80 Downstream Port", + "PowerPort": true, + "Type": "DownstreamPort" + } + ], + "Name": "PowerSupply$ADDRESS % 80", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BUS': 6, 'ADDRESS': 80})", + "OR", + "xyz.openbmc_project.FruDevice({'BUS': 6, 'ADDRESS': 81})", + "AND", + "FOUND('Mt.Jade')" + ], + "Type": "PowerSupply", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + } } ] diff --git a/configurations/mtjefferson_bmc.json b/configurations/mtjefferson_bmc.json new file mode 100644 index 00000000..7fd07002 --- /dev/null +++ b/configurations/mtjefferson_bmc.json @@ -0,0 +1,83 @@ +{ + "Exposes": [ + { + "EntityId": 19, + "EntityInstance": 45, + "Index": 2, + "MaxValue": 4.4, + "MinValue": 0, + "Name": "3V3_SB_BMC", + "PollRate": 10, + "ScaleFactor": 0.5, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.944 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.789 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.647 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.82 + } + ], + "Type": "ADC" + }, + { + "Address": "0x48", + "Bus": 14, + "EntityId": 7, + "EntityInstance": 1, + "MaxValue": 127, + "MinValue": 0, + "Name": "AST2600CPUTemp", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + } + ], + "Name": "Mt.Jefferson_BMC", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Jefferson DC-SCM 2.0'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + }, + "xyz.openbmc_project.Inventory.Item.BMC": {}, + "xyz.openbmc_project.Inventory.Item.NetworkInterface": { + "MACAddress": "$BOARD_INFO_AM1" + } +} diff --git a/configurations/mtjefferson_mb.json b/configurations/mtjefferson_mb.json new file mode 100644 index 00000000..49134bca --- /dev/null +++ b/configurations/mtjefferson_mb.json @@ -0,0 +1,2012 @@ +[ + { + "Exposes": [ + { + "EntityId": 19, + "EntityInstance": 27, + "Index": 3, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_AUX_OCP1", + "PollRate": 15, + "PowerState": "ChassisOn", + "PresenceGpio": [ + { + "Name": "presence-ocp1", + "Polarity": "Low" + } + ], + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 28, + "Index": 4, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_AUX_OCP2", + "PollRate": 15, + "PowerState": "ChassisOn", + "PresenceGpio": [ + { + "Name": "presence-ocp2", + "Polarity": "Low" + } + ], + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 29, + "Index": 5, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_SCM", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 30, + "Index": 6, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_STBY", + "PollRate": 15, + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 31, + "Index": 7, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_PCIe", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 32, + "Index": 8, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_HDD", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 33, + "Index": 9, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_FAN", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 34, + "Index": 10, + "MaxValue": 16, + "MinValue": 0, + "Name": "12V_MB0", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.130434783, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 14.364 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.797 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 9.576 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.143 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 36, + "Index": 12, + "MaxValue": 6.7, + "MinValue": 0, + "Name": "5V_AUX", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.274193548, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 6.023 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 5.76 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.024 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 4.261 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 37, + "Index": 13, + "MaxValue": 4.4, + "MinValue": 0, + "Name": "3V3_AUX", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.404761905, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.944 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.789 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.647 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.82 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 38, + "Index": 14, + "MaxValue": 2.4, + "MinValue": 0, + "Name": "1V8_CPLD_AUX", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.5, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.157 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.062 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.53 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.434 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 39, + "Index": 15, + "MaxValue": 7, + "MinValue": 0, + "Name": "5V_MAIN", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.274193548, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 6.022 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 5.775 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.015 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 4.262 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 40, + "Index": 16, + "MaxValue": 4.4, + "MinValue": 0, + "Name": "3V3_MAIN", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.404761905, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.944 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.789 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.647 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.82 + } + ], + "Type": "ADC" + }, + { + "EntityId": 19, + "EntityInstance": 41, + "Index": 17, + "MaxValue": 1.4, + "MinValue": 0, + "Name": "1V05_VDD", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.205 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.836 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.891 + } + ], + "Type": "ADC" + }, + { + "BridgeGpio": [ + { + "Name": "rtc-battery-voltage-read-enable", + "Polarity": "High" + } + ], + "EntityId": 19, + "EntityInstance": 42, + "Index": 18, + "MaxValue": 4.4, + "MinValue": 0, + "Name": "VBAT_RTC", + "PollRate": 1, + "PowerState": "ChassisOn", + "ScaleFactor": 0.333333333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.944 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.789 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.647 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.82 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 1, + "Index": 19, + "MaxValue": 1.1, + "MinValue": 0, + "Name": "S0_0V8_D2D", + "PollRate": 15, + "PowerState": "On", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.011 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.968 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.644 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.683 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 2, + "Index": 20, + "MaxValue": 1.2, + "MinValue": 0, + "Name": "S0_0V85_SOC", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.022 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.98 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.683 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.725 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 3, + "Index": 21, + "MaxValue": 1.2, + "MinValue": 0, + "Name": "S0_0V85_VDDC_R", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.022 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.98 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.683 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.725 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 4, + "Index": 22, + "MaxValue": 1.2, + "MinValue": 0, + "Name": "S0_0V85_VDDC_L", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.022 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.98 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.683 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.725 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 5, + "Index": 23, + "MaxValue": 1.2, + "MinValue": 0, + "Name": "S0_0V9_RC5A", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.083 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.036 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.721 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.768 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 6, + "Index": 24, + "MaxValue": 2.4, + "MinValue": 0, + "Name": "S0_1V8_RC5A", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 0.5, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.157 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.062 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.434 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.53 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 7, + "Index": 25, + "MaxValue": 1.4, + "MinValue": 0, + "Name": "S0_0V75_PCP", + "PollRate": 15, + "PowerState": "On", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.205 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.6 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.633 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 8, + "Index": 26, + "MaxValue": 1.5, + "MinValue": 0, + "Name": "S0_1V1_VDDQ_0_5", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.316 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.879 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.932 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 9, + "Index": 27, + "MaxValue": 1.5, + "MinValue": 0, + "Name": "S0_1V1_VDDQ_6_11", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.316 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.879 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.932 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 10, + "Index": 28, + "MaxValue": 2.4, + "MinValue": 0, + "Name": "S0_1V8_SOC", + "PollRate": 15, + "PowerState": "On", + "ScaleFactor": 0.5, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.157 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.062 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.434 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.53 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 11, + "Index": 29, + "MaxValue": 1.6, + "MinValue": 0, + "Name": "S0_1V2_SOC", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.436 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.38 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.958 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.014 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 12, + "Index": 30, + "MaxValue": 1.0, + "MinValue": 0, + "Name": "S0_0V75_MEM", + "PollRate": 15, + "PowerState": "ChassisOn", + "PresenceGpio": [ + { + "Name": "cpu-type-detect", + "Polarity": "High" + } + ], + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 0.9 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.865 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.601 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.641 + } + ], + "Type": "ADC" + }, + { + "Bus": 20, + "CPURequired": 0, + "EntityId": 19, + "EntityInstance": 13, + "Index": 31, + "MaxValue": 1.0, + "MinValue": 0, + "Name": "S0_EXT_VREF", + "PollRate": 15, + "PowerState": "ChassisOn", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 0.723 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.613 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.483 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.59 + } + ], + "Type": "ADC" + }, + { + "Class": "Aspeed2600_Hwmon", + "Name": "Chassis_Intrusion_Status", + "Rearm": "Manual", + "Type": "ChassisIntrusionSensor" + }, + { + "Address": "0x5c", + "Bus": "8", + "Connector": { + "Name": "Fan Connector 1", + "Pwm": 0, + "PwmName": "PWM0", + "Tachs": [ + 1 + ] + }, + "Index": 0, + "MaxReading": 21000, + "Name": "FAN0", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 664 + }, + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 20086 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x5c", + "Bus": "8", + "Connector": { + "Name": "Fan Connector 2", + "Pwm": 1, + "PwmName": "PWM1", + "Tachs": [ + 3 + ] + }, + "Index": 2, + "MaxReading": 21000, + "Name": "FAN1", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 664 + }, + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 20086 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x5c", + "Bus": "8", + "Connector": { + "Name": "Fan Connector 3", + "Pwm": 2, + "PwmName": "PWM2", + "Tachs": [ + 5 + ] + }, + "Index": 4, + "MaxReading": 21000, + "Name": "FAN2", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 664 + }, + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 20086 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x5c", + "Bus": "8", + "Connector": { + "Name": "Fan Connector 4", + "Pwm": 3, + "PwmName": "PWM3", + "Tachs": [ + 7 + ] + }, + "Index": 6, + "MaxReading": 21000, + "Name": "FAN3", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 664 + }, + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 20086 + } + ], + "Type": "I2CFan" + }, + { + "Name": "MB Upstream Port", + "Type": "MB Upstream Port" + }, + { + "EntityId": 30, + "EntityInstance": 1, + "MaxValue": 127, + "MinValue": 0, + "Name": "NVMeM2_MaxTemp", + "Sensors": [ + "S0_M2_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 70.359 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "EntityId": 11, + "EntityInstance": 3, + "MaxValue": 127, + "MinValue": 0, + "Name": "OCP_MaxTemp", + "Sensors": [ + "OCP1_Temp" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115.269 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 105.289 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "MaxValue": 130, + "MinValue": -50, + "Name": "S0_DIMMG0_Temp", + "PowerState": "ChassisOn", + "Sensors": [ + "S0_DIMM0_Temp", + "S0_DIMM1_Temp", + "S0_DIMM2_Temp", + "S0_DIMM3_Temp", + "S0_DIMM4_Temp", + "S0_DIMM5_Temp", + "S0_DIMM6_Temp", + "S0_DIMM7_Temp", + "S0_DIMM8_Temp", + "S0_DIMM9_Temp", + "S0_DIMM10_Temp", + "S0_DIMM11_Temp", + "S0_DIMM12_Temp", + "S0_DIMM13_Temp", + "S0_DIMM14_Temp", + "S0_DIMM15_Temp", + "S0_DIMM16_Temp", + "S0_DIMM17_Temp", + "S0_DIMM18_Temp", + "S0_DIMM19_Temp", + "S0_DIMM20_Temp", + "S0_DIMM21_Temp", + "S0_DIMM22_Temp", + "S0_DIMM23_Temp" + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "MaxValue": 127, + "MinValue": 0, + "Name": "FrontBP_MaxTemp", + "Sensors": [ + "FrontBPTemp1", + "FrontBPTemp2" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 70.359 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "MaxValue": 127, + "MinValue": 0, + "Name": "NVMeFBP_MaxTemp", + "Sensors": [ + "nvme0", + "nvme1", + "nvme2", + "nvme3", + "nvme4", + "nvme5", + "nvme6", + "nvme7", + "nvme8", + "nvme9", + "nvme10", + "nvme11" + ], + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 70.359 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "Maximum", + "Units": "DegreesC" + }, + { + "Address": "0x28", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 8, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_M2_Temp", + "Type": "NCT7802" + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "FAN0", + "FAN1", + "FAN2", + "FAN3" + ], + "Name": "Fan_PID", + "OutLimitMax": 100.0, + "OutLimitMin": 10.0, + "Outputs": [ + "PWM0", + "PWM1", + "PWM2", + "PWM3" + ], + "PCoefficient": 0.0, + "SetPoint": 60.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Zone 1" + ] + }, + { + "AccumulateSetPoint": true, + "CycleIntervalTimeMS": 4000, + "FailSafePercent": 100.0, + "MinThermalOutput": 10.0, + "Name": "Zone 1", + "Type": "Pid.Zone", + "UpdateThermalsTimeMS": 6000 + }, + { + "Class": "temp", + "Inputs": [ + "S0_SOC_Pkg_Temp" + ], + "Name": "Stepwise_CPU_MaxTemp", + "NegativeHysteresis": 2.0, + "Output": [ + 20.0, + 25.0, + 30.0, + 40.0, + 45.0, + 50.0, + 55.0, + 60.0, + 65.0, + 70.0, + 75.0, + 80.0, + 85.0, + 90.0, + 95.0, + 100.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 1.0, + 65.0, + 70.0, + 73.0, + 75.0, + 80.0, + 82.0, + 84.0, + 86.0, + 88.0, + 90.0, + 92.0, + 94.0, + 96.0, + 98.0, + 100.0 + ], + "Type": "Stepwise", + "Zones": [ + "Zone 1" + ] + }, + { + "Class": "temp", + "Inputs": [ + "Ambient_Temp" + ], + "Name": "Stepwise_Ambient_Temp", + "NegativeHysteresis": 2.0, + "Output": [ + 15.0, + 20.0, + 25.0, + 30.0, + 35.0, + 40.0, + 70.0, + 100.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 1.0, + 10.0, + 20.0, + 25.0, + 30.0, + 35.0, + 38.0, + 40.0 + ], + "Type": "Stepwise", + "Zones": [ + "Zone 1" + ] + }, + { + "Class": "temp", + "Inputs": [ + "NVMeM2_MaxTemp" + ], + "Name": "Stepwise_NVMeM2_MaxTemp", + "NegativeHysteresis": 2.0, + "Output": [ + 15.0, + 30.0, + 40.0, + 55.0, + 70.0, + 85.0, + 90.0, + 100.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 1.0, + 50.0, + 55.0, + 58.0, + 61.0, + 64.0, + 67.0, + 70.0 + ], + "Type": "Stepwise", + "Zones": [ + "Zone 1" + ] + }, + { + "Class": "temp", + "Inputs": [ + "OCP_MaxTemp" + ], + "MissingIsAcceptable": [ + "OCP_MaxTemp" + ], + "Name": "Stepwise_OCP_MaxTemp", + "NegativeHysteresis": 2.0, + "Output": [ + 15.0, + 25.0, + 50.0, + 55.0, + 60.0, + 65.0, + 70.0, + 75.0, + 80.0, + 85.0, + 90.0, + 95.0, + 100.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 1.0, + 50.0, + 55.0, + 60.0, + 65.0, + 70.0, + 75.0, + 80.0, + 85.0, + 90.0, + 95.0, + 100.0, + 105.0 + ], + "Type": "Stepwise", + "Zones": [ + "Zone 1" + ] + }, + { + "Class": "temp", + "Inputs": [ + "S0_DIMMG0_Temp" + ], + "MissingIsAcceptable": [ + "S0_DIMMG0_Temp" + ], + "Name": "Stepwise_CPU_DIMM_MaxTemp", + "NegativeHysteresis": 2.0, + "Output": [ + 15.0, + 20.0, + 45.0, + 50.0, + 55.0, + 65.0, + 70.0, + 80.0, + 85.0, + 90.0, + 95.0, + 100.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 1.0, + 55.0, + 60.0, + 65.0, + 68.0, + 70.0, + 72.0, + 75.0, + 78.0, + 80.0, + 82.0, + 85.0 + ], + "Type": "Stepwise", + "Zones": [ + "Zone 1" + ] + }, + { + "MaxValue": 5400, + "MinValue": 0, + "Name": "total_power", + "Sensors": [ + "PSU1_POUT", + "PSU2_POUT" + ], + "Type": "Sum", + "Units": "Watts" + }, + { + "Address": "0x1f", + "Bus": 30, + "EntityId": 11, + "EntityInstance": 1, + "MaxValue": 127, + "MinValue": 0, + "Name": "OCP1_Local_Temp", + "Name1": "OCP1_Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Index": 2, + "Name": "upper critical", + "Severity": 1, + "Value": 115.269 + }, + { + "Direction": "greater than", + "Index": 2, + "Name": "upper non critical", + "Severity": 0, + "Value": 105.289 + }, + { + "Direction": "less than", + "Index": 2, + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Index": 2, + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP421" + }, + { + "Address": "0x4b", + "Bus": 20, + "CPURequired": 0, + "EntityId": 3, + "EntityInstance": 8, + "MaxValue": 127, + "MinValue": 0, + "Name": "MB0_THERM_Lcl", + "Name1": "S0_THDIODE_3", + "Name2": "S0_THDIODE_2", + "Name3": "S0_THDIODE_1", + "Name4": "S0_THDIODE_0", + "Type": "TMP464" + }, + { + "Address": "0x4f", + "Bus": 7, + "EntityId": 55, + "EntityInstance": 1, + "MaxValue": 127, + "MinValue": 0, + "Name": "Ambient_Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 43.413 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 38.423 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4e", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 2, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_Mem1Inlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x49", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 3, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_Mem1Outlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x48", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 4, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_Mem2Inlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4a", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 5, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_Mem2Outlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4d", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 6, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_CPUInlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4f", + "Bus": 20, + "CPURequired": 0, + "EntityId": 7, + "EntityInstance": 7, + "MaxValue": 127, + "MinValue": 0, + "Name": "S0_CPUOutlet", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.0 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5.489 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x58", + "Bus": 24, + "Labels": [ + "temp1", + "pout1" + ], + "Name": "PSU1", + "PollRate": 10, + "Type": "pmbus", + "pout1_Max": 2700.0, + "pout1_Min": 0, + "pout1_Name": "PSU1_POUT", + "temp1_Max": 127.0, + "temp1_Min": 0, + "temp1_Name": "PSU1_TEMP" + }, + { + "Address": "0x59", + "Bus": 24, + "Labels": [ + "temp1", + "pout1" + ], + "Name": "PSU2", + "PollRate": 10, + "Type": "pmbus", + "pout1_Max": 2700.0, + "pout1_Min": 0, + "pout1_Name": "PSU2_POUT", + "temp1_Max": 127.0, + "temp1_Min": 0, + "temp1_Name": "PSU2_TEMP" + } + ], + "Name": "Mt.Jefferson_Motherboard", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Jefferson CIO'})", + "Type": "Board", + "xyz.openbmc_project.Common.UUID": { + "UUID": "$MULTIRECORD_UUID" + }, + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME $PRODUCT_VERSION", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Compatible": { + "Names": [ + "com.ampere.Hardware.Chassis.Model.MtJefferson" + ] + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + }, + "xyz.openbmc_project.Inventory.Item.System": {} + }, + { + "Exposes": [ + { + "ConnectsToType": "MB Upstream Port", + "Name": "PowerSupply$ADDRESS % 80 Downstream Port", + "PowerPort": true, + "Type": "DownstreamPort" + } + ], + "Name": "PowerSupply$ADDRESS % 80", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BUS': 24, 'ADDRESS': 80})", + "OR", + "xyz.openbmc_project.FruDevice({'BUS': 24, 'ADDRESS': 81})" + ], + "Type": "PowerSupply", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + } + } +] diff --git a/configurations/mtmitchell_bp.json b/configurations/mtmitchell_bp.json new file mode 100644 index 00000000..5167cafb --- /dev/null +++ b/configurations/mtmitchell_bp.json @@ -0,0 +1,87 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Mitchell BP_$BUS % 100 + 1", + "Type": "EEPROM" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 0", + "Name": "nvme$BUS % 100 * 8 + 0", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 1", + "Name": "nvme$BUS % 100 * 8 + 1", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 2", + "Name": "nvme$BUS % 100 * 8 + 2", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 3", + "Name": "nvme$BUS % 100 * 8 + 3", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 4", + "Name": "nvme$BUS % 100 * 8 + 4", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 5", + "Name": "nvme$BUS % 100 * 8 + 5", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 6", + "Name": "nvme$BUS % 100 * 8 + 6", + "Type": "NVME1000" + }, + { + "Address": "0x6a", + "Bus": "$BUS % 100 * 8 + 48 + 7", + "Name": "nvme$BUS % 100 * 8 + 7", + "Type": "NVME1000" + }, + { + "Address": "0x4C", + "Bus": "$bus", + "Name": "FrontBPTemp$BUS % 100 + 1", + "Type": "TMP75" + } + ], + "Name": "Mitchell BP_$BUS % 100", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': 'YZBB-01650-105'})", + "OR", + "xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': 'YZBB-02856-102'})", + "AND", + "FOUND('Mt.Mitchell_Motherboard')" + ], + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$BOARD_INFO_AM1" + } +} diff --git a/configurations/mtmitchell_mb.json b/configurations/mtmitchell_mb.json index d218b67b..69a303b7 100644 --- a/configurations/mtmitchell_mb.json +++ b/configurations/mtmitchell_mb.json @@ -2280,5 +2280,37 @@ "Version": "$PRODUCT_VERSION" }, "xyz.openbmc_project.Inventory.Item.System": {} + }, + { + "Exposes": [ + { + "ConnectsToType": "MB Upstream Port", + "Name": "PowerSupply$ADDRESS % 80 Downstream Port", + "PowerPort": true, + "Type": "DownstreamPort" + } + ], + "Name": "PowerSupply$ADDRESS % 80", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BUS': 2, 'ADDRESS': 80})", + "OR", + "xyz.openbmc_project.FruDevice({'BUS': 2, 'ADDRESS': 81})", + "AND", + "FOUND('Mt.Mitchell_Motherboard')" + ], + "Type": "PowerSupply", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + } } ] diff --git a/configurations/mtmitchell_riser.json b/configurations/mtmitchell_riser.json new file mode 100644 index 00000000..75c613b6 --- /dev/null +++ b/configurations/mtmitchell_riser.json @@ -0,0 +1,31 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Mitchell_Riser_$BUS - 38", + "Type": "EEPROM" + } + ], + "Name": "Mitchell_Riser_$BUS - 38", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BOARD_PART_NUMBER': '.*YZRI-02759-103.*'})", + "AND", + "FOUND('Mt.Mitchell_Motherboard')" + ], + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.Replaceable": { + "FieldReplaceable": false, + "HotPluggable": false + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$BOARD_INFO_AM1" + } +} diff --git a/configurations/nvidia_gb200.json b/configurations/nvidia_gb200.json new file mode 100644 index 00000000..3926b254 --- /dev/null +++ b/configurations/nvidia_gb200.json @@ -0,0 +1,26 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "NVIDIA GB200 $bus + 1 % 2 FRU", + "Type": "EEPROM" + } + ], + "Name": "NVIDIA GB200 $bus + 1 % 2", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'PG548', 'BOARD_MANUFACTURER': 'NVIDIA'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } +} diff --git a/configurations/nvidia_gb200_io_board.json b/configurations/nvidia_gb200_io_board.json new file mode 100644 index 00000000..1293c78d --- /dev/null +++ b/configurations/nvidia_gb200_io_board.json @@ -0,0 +1,98 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "NVIDIA GB200 IO Board $bus FRU", + "Type": "EEPROM" + }, + { + "Address": "0x1f", + "Bus": 36, + "Labels": [ + "temp2" + ], + "Name": "IOB$bus_NIC0_LOCAL_TEMP_C", + "Name1": "IOB$bus_NIC0_TEMP_C", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Index": 2, + "Name": "upper critical", + "Severity": 1, + "Value": 108.0 + }, + { + "Direction": "greater than", + "Index": 2, + "Name": "upper non critical", + "Severity": 0, + "Value": 105.0 + }, + { + "Direction": "less than", + "Index": 2, + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + } + ], + "Type": "TMP421" + }, + { + "Address": "0x1f", + "Bus": 38, + "Labels": [ + "temp2" + ], + "Name": "IOB$bus_NIC1_LOCAL_TEMP_C", + "Name1": "IOB$bus_NIC1_TEMP_C", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Index": 2, + "Name": "upper critical", + "Severity": 1, + "Value": 108.0 + }, + { + "Direction": "greater than", + "Index": 2, + "Name": "upper non critical", + "Severity": 0, + "Value": 105.0 + }, + { + "Direction": "less than", + "Index": 2, + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + } + ], + "Type": "TMP421" + } + ], + "Name": "NVIDIA GB200 IO Board $bus", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'P4768', 'BOARD_MANUFACTURER': 'NVIDIA'})", + "OR", + "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'ConnectX-7 400GE 2P NIC', 'BOARD_MANUFACTURER': 'Nvidia'})" + ], + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } +} diff --git a/configurations/nvidia_hmc.json b/configurations/nvidia_hmc.json new file mode 100644 index 00000000..f541408a --- /dev/null +++ b/configurations/nvidia_hmc.json @@ -0,0 +1,33 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "NVIDIA HMC FRU", + "Type": "EEPROM" + }, + { + "AuthType": "None", + "Hostname": "172.31.13.251", + "Name": "HMC", + "Port": 80, + "Type": "SatelliteController" + } + ], + "Name": "NVIDIA HMC", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'P4764', 'BOARD_MANUFACTURER': 'NVIDIA'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } +} diff --git a/configurations/system1_chassis.json b/configurations/system1_chassis.json index 546a8455..0a0bac31 100644 --- a/configurations/system1_chassis.json +++ b/configurations/system1_chassis.json @@ -5,10 +5,11 @@ "BindConnector": "Fan1 connector", "Bus": 6, "Index": 0, - "MaxReading": 36200, + "MaxReading": 14500, "Name": "Fan1a_in", "PowerState": "Always", "Presence": { + "MonitorType": "Polling", "PinName": "FAN0_PRESENCE_R_N", "Polarity": "Low" }, @@ -42,12 +43,17 @@ }, { "Address": "0x52", - "BindConnector": "Fan1 connector", + "BindConnector": "Fan2 connector", "Bus": 6, "Index": 1, - "MaxReading": 0, - "Name": "Fan1b_in", + "MaxReading": 14500, + "Name": "Fan2a_in", "PowerState": "Always", + "Presence": { + "MonitorType": "Polling", + "PinName": "FAN1_PRESENCE_R_N", + "Polarity": "Low" + }, "Thresholds": [ { "Direction": "less than", @@ -78,14 +84,15 @@ }, { "Address": "0x52", - "BindConnector": "Fan2 connector", + "BindConnector": "Fan3 connector", "Bus": 6, "Index": 2, - "MaxReading": 0, - "Name": "Fan2a_in", + "MaxReading": 14500, + "Name": "Fan3a_in", "PowerState": "Always", "Presence": { - "PinName": "FAN1_PRESENCE_R_N", + "MonitorType": "Polling", + "PinName": "FAN2_PRESENCE_R_N", "Polarity": "Low" }, "Thresholds": [ @@ -118,12 +125,17 @@ }, { "Address": "0x52", - "BindConnector": "Fan2 connector", + "BindConnector": "Fan4 connector", "Bus": 6, "Index": 3, - "MaxReading": 0, - "Name": "Fan2b_in", + "MaxReading": 14500, + "Name": "Fan4a_in", "PowerState": "Always", + "Presence": { + "MonitorType": "Polling", + "PinName": "FAN3_PRESENCE_R_N", + "Polarity": "Low" + }, "Thresholds": [ { "Direction": "less than", @@ -154,14 +166,15 @@ }, { "Address": "0x52", - "BindConnector": "Fan3 connector", + "BindConnector": "Fan5 connector", "Bus": 6, "Index": 4, - "MaxReading": 0, - "Name": "Fan3a_in", + "MaxReading": 14500, + "Name": "Fan5a_in", "PowerState": "Always", "Presence": { - "PinName": "FAN2_PRESENCE_R_N", + "MonitorType": "Polling", + "PinName": "FAN4_PRESENCE_R_N", "Polarity": "Low" }, "Thresholds": [ @@ -194,12 +207,17 @@ }, { "Address": "0x52", - "BindConnector": "Fan3 connector", + "BindConnector": "Fan1 connector", "Bus": 6, "Index": 5, - "MaxReading": 0, - "Name": "Fan3b_in", + "MaxReading": 14500, + "Name": "Fan1b_in", "PowerState": "Always", + "Presence": { + "MonitorType": "Polling", + "PinName": "FAN0_PRESENCE_R_N", + "Polarity": "Low" + }, "Thresholds": [ { "Direction": "less than", @@ -230,14 +248,15 @@ }, { "Address": "0x52", - "BindConnector": "Fan4 connector", + "BindConnector": "Fan2 connector", "Bus": 6, "Index": 6, - "MaxReading": 0, - "Name": "Fan4a_in", + "MaxReading": 14500, + "Name": "Fan2b_in", "PowerState": "Always", "Presence": { - "PinName": "FAN3_PRESENCE_R_N", + "MonitorType": "Polling", + "PinName": "FAN1_PRESENCE_R_N", "Polarity": "Low" }, "Thresholds": [ @@ -270,12 +289,17 @@ }, { "Address": "0x52", - "BindConnector": "Fan4 connector", + "BindConnector": "Fan3 connector", "Bus": 6, "Index": 7, - "MaxReading": 0, - "Name": "Fan4b_in", + "MaxReading": 14500, + "Name": "Fan3b_in", "PowerState": "Always", + "Presence": { + "MonitorType": "Polling", + "PinName": "FAN2_PRESENCE_R_N", + "Polarity": "Low" + }, "Thresholds": [ { "Direction": "less than", @@ -306,14 +330,15 @@ }, { "Address": "0x52", - "BindConnector": "Fan5 connector", + "BindConnector": "Fan4 connector", "Bus": 6, "Index": 8, - "MaxReading": 0, - "Name": "Fan5a_in", + "MaxReading": 14500, + "Name": "Fan4b_in", "PowerState": "Always", "Presence": { - "PinName": "FAN4_PRESENCE_R_N", + "MonitorType": "Polling", + "PinName": "FAN3_PRESENCE_R_N", "Polarity": "Low" }, "Thresholds": [ @@ -349,9 +374,14 @@ "BindConnector": "Fan5 connector", "Bus": 6, "Index": 9, - "MaxReading": 0, + "MaxReading": 14500, "Name": "Fan5b_in", "PowerState": "Always", + "Presence": { + "MonitorType": "Polling", + "PinName": "FAN4_PRESENCE_R_N", + "Polarity": "Low" + }, "Thresholds": [ { "Direction": "less than", @@ -385,10 +415,11 @@ "BindConnector": "Fan6 connector", "Bus": 6, "Index": 0, - "MaxReading": 0, + "MaxReading": 25000, "Name": "Fan6_in", "PowerState": "Always", "Presence": { + "MonitorType": "Polling", "PinName": "FAN5_PRESENCE_N", "Polarity": "Low" }, @@ -425,10 +456,11 @@ "BindConnector": "Fan7 connector", "Bus": 6, "Index": 1, - "MaxReading": 0, + "MaxReading": 25000, "Name": "Fan7_in", "PowerState": "Always", "Presence": { + "MonitorType": "Polling", "PinName": "FAN6_PRESENCE_N", "Polarity": "Low" }, @@ -691,7 +723,8 @@ "ILimitMin": 2500, "Inputs": [ "Ambient 0 Temp", - "Ambient 1 Temp" + "Ambient 1 Temp", + "Ambient 2 Temp" ], "Name": "Ambient Temperature", "NegativeHysteresis": 0, @@ -708,15 +741,45 @@ "CECIO" ] }, + { + "Class": "temp", + "FFGainCoefficient": 0, + "FFOffCoefficient": 0, + "ICoefficient": -5, + "ILimitMax": 18000, + "ILimitMin": 2500, + "Inputs": [ + "PCIE_SWITCH1_TEMP", + "PCIE_SWITCH2_TEMP", + "PCIE_SWITCH3_TEMP", + "PCIE_SWITCH4_TEMP", + "PCIE_SWITCH5_TEMP", + "PCIE_SWITCH6_TEMP" + ], + "Name": "PCIE Switch Temperature", + "NegativeHysteresis": 0, + "OutLimitMax": 18000, + "OutLimitMin": 2500, + "Outputs": [], + "PCoefficient": -500, + "PositiveHysteresis": 0, + "SetPoint": 85, + "SlewNeg": 0, + "SlewPos": 0, + "Type": "Pid", + "Zones": [ + "CECIO" + ] + }, { "FailSafePercent": 100, - "MinThermalOutput": 2500, + "MinThermalOutput": 8800, "Name": "CECIO", "Type": "Pid.Zone" }, { "FailSafePercent": 100, - "MinThermalOutput": 2500, + "MinThermalOutput": 10000, "Name": "NVME", "Type": "Pid.Zone" } diff --git a/configurations/ventura_fanboard.json b/configurations/ventura_fanboard.json new file mode 100644 index 00000000..1e8ccadb --- /dev/null +++ b/configurations/ventura_fanboard.json @@ -0,0 +1,384 @@ +[ + { + "Exposes": [ + { + "Address": "0x1f", + "Bus": "$bus", + "Labels": [ + "in0", + "in1", + "in2", + "in3" + ], + "Name": "FAN_ADC", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "in0", + "Name": "upper critical", + "Severity": 1, + "Value": 13.6 + }, + { + "Direction": "less than", + "Label": "in0", + "Name": "lower critical", + "Severity": 1, + "Value": 10.5 + }, + { + "Direction": "greater than", + "Label": "in2", + "Name": "upper critical", + "Severity": 1, + "Value": 13.6 + }, + { + "Direction": "less than", + "Label": "in2", + "Name": "lower critical", + "Severity": 1, + "Value": 10.5 + } + ], + "Type": "ADC128D818", + "in0_Name": "FCB_0_FAN_0_VOLT_V", + "in0_Scale": 166.667, + "in1_Name": "FCB_0_FAN_0_CURR_A", + "in1_Scale": 464, + "in2_Name": "FCB_0_FAN_1_VOLT_V", + "in2_Scale": 166.667, + "in3_Name": "FCB_0_FAN_1_CURR_A", + "in3_Scale": 464 + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_0_FAN0_TACH_OL", + "Pwm": 0, + "PwmName": "FCB_0_FAN0_PWM", + "Tachs": [ + 1 + ] + }, + "Index": 1, + "Name": "FCB_0_FAN0_TACH_OL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 33000 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1960 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_0_FAN0_TACH_IL", + "Pwm": 0, + "PwmName": "FCB_0_FAN0_PWM", + "Tachs": [ + 0 + ] + }, + "Index": 0, + "Name": "FCB_0_FAN0_TACH_IL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 36300 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2550 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_0_FAN1_TACH_OL", + "Pwm": 2, + "PwmName": "FCB_0_FAN1_PWM", + "Tachs": [ + 2 + ] + }, + "Index": 2, + "Name": "FCB_0_FAN1_TACH_OL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 33000 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1960 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_0_FAN1_TACH_IL", + "Pwm": 2, + "PwmName": "FCB_0_FAN1_PWM", + "Tachs": [ + 7 + ] + }, + "Index": 7, + "Name": "FCB_0_FAN1_TACH_IL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 36300 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2550 + } + ], + "Type": "I2CFan" + } + ], + "Name": "Ventura Fan Board 0", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } + }, + { + "Exposes": [ + { + "Address": "0x1f", + "Bus": "$bus", + "Labels": [ + "in0", + "in1", + "in2", + "in3" + ], + "Name": "FAN_ADC", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "in0", + "Name": "upper critical", + "Severity": 1, + "Value": 13.6 + }, + { + "Direction": "less than", + "Label": "in0", + "Name": "lower critical", + "Severity": 1, + "Value": 10.5 + }, + { + "Direction": "greater than", + "Label": "in2", + "Name": "upper critical", + "Severity": 1, + "Value": 13.6 + }, + { + "Direction": "less than", + "Label": "in2", + "Name": "lower critical", + "Severity": 1, + "Value": 10.5 + } + ], + "Type": "ADC128D818", + "in0_Name": "FCB_1_FAN_2_VOLT_V", + "in0_Scale": 166.667, + "in1_Name": "FCB_1_FAN_2_CURR_A", + "in1_Scale": 464, + "in2_Name": "FCB_1_FAN_3_VOLT_V", + "in2_Scale": 166.667, + "in3_Name": "FCB_1_FAN_3_CURR_A", + "in3_Scale": 464 + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_1_FAN2_TACH_OL", + "Pwm": 3, + "PwmName": "FCB_1_FAN2_PWM", + "Tachs": [ + 4 + ] + }, + "Index": 4, + "Name": "FCB_1_FAN2_TACH_OL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 33000 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1960 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_1_FAN2_TACH_IL", + "Pwm": 3, + "PwmName": "FCB_1_FAN2_PWM", + "Tachs": [ + 3 + ] + }, + "Index": 3, + "Name": "FCB_1_FAN2_TACH_IL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 36300 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2550 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_1_FAN3_TACH_OL", + "Pwm": 5, + "PwmName": "FCB_1_FAN3_PWM", + "Tachs": [ + 5 + ] + }, + "Index": 5, + "Name": "FCB_1_FAN3_TACH_OL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 33000 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1960 + } + ], + "Type": "I2CFan" + }, + { + "Address": "0x20", + "Bus": "18", + "Connector": { + "Name": "FCB_1_FAN3_TACH_IL", + "Pwm": 5, + "PwmName": "FCB_1_FAN3_PWM", + "Tachs": [ + 10 + ] + }, + "Index": 10, + "Name": "FCB_1_FAN3_TACH_IL_SPEED_RPM", + "PowerState": "Always", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 36300 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2550 + } + ], + "Type": "I2CFan" + } + ], + "Name": "Ventura Fan Board 1", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } + } +] diff --git a/configurations/ventura_ioboard.json b/configurations/ventura_ioboard.json new file mode 100644 index 00000000..db470a4e --- /dev/null +++ b/configurations/ventura_ioboard.json @@ -0,0 +1,27 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Ventura Rear IO BD $bus", + "Type": "Board" + } + ], + "Name": "Ventura Rear IO BD", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura Rear IO BD'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } +} diff --git a/configurations/ventura_ledboard.json b/configurations/ventura_ledboard.json new file mode 100644 index 00000000..f33ce75f --- /dev/null +++ b/configurations/ventura_ledboard.json @@ -0,0 +1,27 @@ +{ + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Ventura RMC LED Board $bus", + "Type": "Board" + } + ], + "Name": "Ventura RMC LED Board", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC LED Board'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + } +} diff --git a/configurations/ventura_rmc.json b/configurations/ventura_rmc.json new file mode 100644 index 00000000..3856ddeb --- /dev/null +++ b/configurations/ventura_rmc.json @@ -0,0 +1,327 @@ +{ + "Exposes": [ + { + "Address": "0x40", + "Bus": 10, + "Labels": [ + "in1", + "curr1", + "power1" + ], + "Name": "RMC_M12_P24V", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "curr1", + "Name": "upper critical", + "Severity": 1, + "Value": 8.33 + }, + { + "Direction": "less than", + "Label": "curr1", + "Name": "lower critical", + "Severity": 1, + "Value": -0.05 + }, + { + "Direction": "greater than", + "Label": "in1", + "Name": "upper critical", + "Severity": 1, + "Value": 25.2 + }, + { + "Direction": "less than", + "Label": "in1", + "Name": "lower critical", + "Severity": 1, + "Value": 22.8 + }, + { + "Direction": "greater than", + "Label": "power1", + "Name": "upper critical", + "Severity": 1, + "Value": 199.92 + }, + { + "Direction": "less than", + "Label": "power1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "INA230", + "curr1_Name": "RMC_M12_P24V_CURR_A", + "in1_Name": "RMC_M12_P24V_VOLT_V", + "power1_Name": "RMC_M12_P24V_PWR_W" + }, + { + "Address": "0x45", + "Bus": 10, + "Labels": [ + "in1", + "curr1", + "power1" + ], + "Name": "RMC_RJ14_P24V", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "curr1", + "Name": "upper critical", + "Severity": 1, + "Value": 8.33 + }, + { + "Direction": "less than", + "Label": "curr1", + "Name": "lower critical", + "Severity": 1, + "Value": -0.05 + }, + { + "Direction": "greater than", + "Label": "in1", + "Name": "upper critical", + "Severity": 1, + "Value": 25.2 + }, + { + "Direction": "less than", + "Label": "in1", + "Name": "lower critical", + "Severity": 1, + "Value": 22.8 + }, + { + "Direction": "greater than", + "Label": "power1", + "Name": "upper critical", + "Severity": 1, + "Value": 199.92 + }, + { + "Direction": "less than", + "Label": "power1", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "INA230", + "curr1_Name": "RMC_RJ14_P24V_CURR_A", + "in1_Name": "RMC_RJ14_P24V_VOLT_V", + "power1_Name": "RMC_RJ14_P24V_PWR_W" + }, + { + "Address": "0x41", + "Bus": 10, + "Labels": [ + "in0" + ], + "Name": "RMC_MEDUSA_RETURN", + "Thresholds": [ + { + "Direction": "less than", + "Label": "in0", + "Name": "lower critical", + "Severity": 1, + "Value": 10.8 + }, + { + "Direction": "greater than", + "Label": "in0", + "Name": "upper critical", + "Severity": 1, + "Value": 13.2 + } + ], + "Type": "INA238", + "in0_Name": "RMC_MEDUSA_RETURN_VDROP_V" + }, + { + "Address": "0x43", + "Bus": 10, + "Labels": [ + "in0" + ], + "Name": "RMC_MEDUSA_POSITIVE", + "Thresholds": [ + { + "Direction": "less than", + "Label": "in0", + "Name": "lower critical", + "Severity": 1, + "Value": 10.8 + }, + { + "Direction": "greater than", + "Label": "in0", + "Name": "upper critical", + "Severity": 1, + "Value": 13.2 + } + ], + "Type": "INA238", + "in0_Name": "RMC_MEDUSA_POSITIVE_VDROP_V" + }, + { + "Address": "0x44", + "Bus": 10, + "Labels": [ + "iout1", + "pin", + "temp1", + "vin", + "vout1" + ], + "Name": "RMC_HSC", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 100 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 56 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 46 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 56 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 46 + }, + { + "Direction": "greater than", + "Label": "pin", + "Name": "upper critical", + "Severity": 1, + "Value": 334.4 + } + ], + "Type": "LTC4287", + "iout1_Name": "RMC_HSC_CURR_A", + "pin_Name": "RMC_HSC_PWR_W", + "temp1_Name": "RMC_HSC_TEMP_C", + "vin_Name": "RMC_HSC_VIN_VOLT_V", + "vout1_Name": "RMC_HSC_VOUT_VOLT_V" + }, + { + "Address": "0x4f", + "Bus": 5, + "Name": "RMC_TEMP_C", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 45 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x69", + "Bus": 10, + "Labels": [ + "iout1", + "temp1", + "vin", + "vout1" + ], + "Name": "RMC_BRICK", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "temp1", + "Name": "upper critical", + "Severity": 1, + "Value": 100 + }, + { + "Direction": "less than", + "Label": "vin", + "Name": "lower critical", + "Severity": 1, + "Value": 46 + }, + { + "Direction": "greater than", + "Label": "vin", + "Name": "upper critical", + "Severity": 1, + "Value": 56 + }, + { + "Direction": "less than", + "Label": "vout1", + "Name": "lower critical", + "Severity": 1, + "Value": 10.5 + }, + { + "Direction": "greater than", + "Label": "vout1", + "Name": "upper critical", + "Severity": 1, + "Value": 13.6 + } + ], + "Type": "pmbus", + "iout1_Name": "RMC_BRICK_CURR_A", + "temp1_Name": "RMC_BRICK_TEMP_C", + "vin_Name": "RMC_BRICK_INPUT_VOLT_V", + "vout1_Name": "RMC_BRICK_OUTPUT_VOLT_V" + } + ], + "Name": "Ventura RMC", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + }, + "xyz.openbmc_project.Inventory.Item.NetworkInterface": { + "MACAddress": "$CHASSIS_INFO_AM2" + } +} diff --git a/configurations/ventura_scm.json b/configurations/ventura_scm.json new file mode 100644 index 00000000..ea6e56e0 --- /dev/null +++ b/configurations/ventura_scm.json @@ -0,0 +1,227 @@ +{ + "Exposes": [ + { + "Index": 0, + "Name": "SCM_P12V_VOLT_V", + "ScaleFactor": 0.112359551, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.2 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.8 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "SCM_P5V_VOLT_V", + "ScaleFactor": 0.27173913, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 5.25 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.75 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "SCM_P3V3_VOLT_V", + "ScaleFactor": 0.410677618, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.6 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 3.0 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "SCM_P2V5_VOLT_V", + "ScaleFactor": 0.54200542, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.625 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.375 + } + ], + "Type": "ADC" + }, + { + "Index": 4, + "Name": "SCM_P1V8_VOLT_V", + "ScaleFactor": 0.750469043, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.98 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.62 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "SCM_PGPPA_VOLT_V", + "ScaleFactor": 0.410677618, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.6 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.62 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "SCM_P1V2_VOLT_V", + "ScaleFactor": 1, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.26 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.14 + } + ], + "Type": "ADC" + }, + { + "BridgeGpio": [ + { + "Name": "BATTERY_DETECT", + "Polarity": "High", + "SetupTime": 1 + } + ], + "Index": 7, + "Name": "SCM_P3V_BAT_VOLT_V", + "PollRate": 86400, + "ScaleFactor": 0.333333333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.4 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.6 + } + ], + "Type": "ADC" + }, + { + "Index": 8, + "Name": "SCM_P1V0_VOLT_V", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.1 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.9 + } + ], + "Type": "ADC" + }, + { + "Name": "BMC", + "Type": "BMC" + }, + { + "Address": "$address", + "Bus": "$bus", + "Name": "Ventura SCM FRU", + "Type": "EEPROM" + }, + { + "Address": "0x4b", + "Bus": 9, + "Name": "SCM_TEMP_C", + "Type": "TMP75" + } + ], + "Name": "Ventura SCM", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura SCM'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "BuildDate": "$BOARD_MANUFACTURE_DATE", + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER", + "SparePartNumber": "$BOARD_INFO_AM1" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Decorator.Revision": { + "Version": "$PRODUCT_VERSION" + }, + "xyz.openbmc_project.Inventory.Item.NetworkInterface": { + "MACAddress": "$CHASSIS_INFO_AM2" + } +} diff --git a/configurations/yosemite4.json b/configurations/yosemite4.json index cee09350..bad67342 100644 --- a/configurations/yosemite4.json +++ b/configurations/yosemite4.json @@ -2,7 +2,7 @@ "Exposes": [ { "Index": 0, - "Name": "MGNT_P12V_VOLT_V", + "Name": "MGNT_ADC_P12V_VOLT_V", "ScaleFactor": 0.1124, "Thresholds": [ { @@ -48,7 +48,7 @@ }, { "Index": 1, - "Name": "MGNT_P5V_VOLT_V", + "Name": "MGNT_ADC_P5V_VOLT_V", "ScaleFactor": 0.2717, "Thresholds": [ { @@ -92,7 +92,7 @@ }, { "Index": 2, - "Name": "MGNT_P3V3_VOLT_V", + "Name": "MGNT_ADC_P3V3_VOLT_V", "ScaleFactor": 0.4107, "Thresholds": [ { @@ -136,7 +136,7 @@ }, { "Index": 3, - "Name": "MGNT_P2V5_VOLT_V", + "Name": "MGNT_ADC_P2V5_VOLT_V", "ScaleFactor": 0.542, "Thresholds": [ { @@ -168,7 +168,7 @@ }, { "Index": 4, - "Name": "MGNT_P1V8_VOLT_V", + "Name": "MGNT_ADC_P1V8_VOLT_V", "ScaleFactor": 1, "Thresholds": [ { @@ -200,7 +200,7 @@ }, { "Index": 5, - "Name": "MGNT_P3V3_RGM_VOLT_V", + "Name": "MGNT_ADC_P3V3_RGM_VOLT_V", "ScaleFactor": 0.4107, "Thresholds": [ { @@ -232,7 +232,7 @@ }, { "Index": 6, - "Name": "MGNT_P1V2_VOLT_V", + "Name": "MGNT_ADC_P1V2_VOLT_V", "ScaleFactor": 1, "Thresholds": [ { @@ -276,7 +276,7 @@ }, { "Index": 7, - "Name": "MGNT_P0V6_VOLT_V", + "Name": "MGNT_ADC_P0V6_VOLT_V", "ScaleFactor": 1, "Thresholds": [ { @@ -308,7 +308,7 @@ }, { "Index": 8, - "Name": "MGNT_P1V0_VOLT_V", + "Name": "MGNT_ADC_P1V0_VOLT_V", "ScaleFactor": 1, "Thresholds": [ { @@ -352,7 +352,7 @@ }, { "Index": 9, - "Name": "MGNT_P5V_USB_VOLT_V", + "Name": "MGNT_ADC_P5V_USB_VOLT_V", "ScaleFactor": 0.2717, "Thresholds": [ { @@ -403,7 +403,7 @@ } ], "Index": 10, - "Name": "MGNT_P3V_BAT_VOLT_V", + "Name": "MGNT_ADC_P3V_BAT_VOLT_V", "PollRate": 3600, "ScaleFactor": 0.3333, "Thresholds": [ @@ -438,63 +438,64 @@ "Class": "fan", "FFGainCoefficient": 1.0, "FFOffCoefficient": 0.0, + "FailSafePercent": 80.0, "ICoefficient": 0.0, "ILimitMax": 0.0, "ILimitMin": 0.0, "Inputs": [ - "FANBOARD0_FAN0_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN0_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN1_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN1_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN2_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN2_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN3_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN3_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN4_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN4_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN5_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN5_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN6_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN6_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN7_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN7_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN8_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN8_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN9_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN9_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN10_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN10_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN11_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN11_TACH_OL_SPEED_RPM" + "FANBOARD0_FAN0_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN0_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN1_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN1_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN2_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN2_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN3_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN3_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN4_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN4_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN5_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN5_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN6_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN6_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN7_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN7_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN8_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN8_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN9_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN9_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN10_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN10_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN11_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN11_TACH_OUTLET_SPEED_RPM" ], "Name": "All Fan", "OutLimitMax": 100.0, "OutLimitMin": 0.0, "Outputs": [ - "FANBOARD0_FAN0_PWM_TACH_PCT", - "FANBOARD0_FAN0_PWM_TACH_PCT", - "FANBOARD0_FAN1_PWM_TACH_PCT", - "FANBOARD0_FAN1_PWM_TACH_PCT", - "FANBOARD1_FAN2_PWM_TACH_PCT", - "FANBOARD1_FAN2_PWM_TACH_PCT", - "FANBOARD1_FAN3_PWM_TACH_PCT", - "FANBOARD1_FAN3_PWM_TACH_PCT", - "FANBOARD0_FAN4_PWM_TACH_PCT", - "FANBOARD0_FAN4_PWM_TACH_PCT", - "FANBOARD0_FAN5_PWM_TACH_PCT", - "FANBOARD0_FAN5_PWM_TACH_PCT", - "FANBOARD1_FAN6_PWM_TACH_PCT", - "FANBOARD1_FAN6_PWM_TACH_PCT", - "FANBOARD1_FAN7_PWM_TACH_PCT", - "FANBOARD1_FAN7_PWM_TACH_PCT", - "FANBOARD0_FAN8_PWM_TACH_PCT", - "FANBOARD0_FAN8_PWM_TACH_PCT", - "FANBOARD0_FAN9_PWM_TACH_PCT", - "FANBOARD0_FAN9_PWM_TACH_PCT", - "FANBOARD1_FAN10_PWM_TACH_PCT", - "FANBOARD1_FAN10_PWM_TACH_PCT", - "FANBOARD1_FAN11_PWM_TACH_PCT", - "FANBOARD1_FAN11_PWM_TACH_PCT" + "FANBOARD0_FAN0_PWM_PCT", + "FANBOARD0_FAN0_PWM_PCT", + "FANBOARD0_FAN1_PWM_PCT", + "FANBOARD0_FAN1_PWM_PCT", + "FANBOARD1_FAN2_PWM_PCT", + "FANBOARD1_FAN2_PWM_PCT", + "FANBOARD1_FAN3_PWM_PCT", + "FANBOARD1_FAN3_PWM_PCT", + "FANBOARD0_FAN4_PWM_PCT", + "FANBOARD0_FAN4_PWM_PCT", + "FANBOARD0_FAN5_PWM_PCT", + "FANBOARD0_FAN5_PWM_PCT", + "FANBOARD1_FAN6_PWM_PCT", + "FANBOARD1_FAN6_PWM_PCT", + "FANBOARD1_FAN7_PWM_PCT", + "FANBOARD1_FAN7_PWM_PCT", + "FANBOARD0_FAN8_PWM_PCT", + "FANBOARD0_FAN8_PWM_PCT", + "FANBOARD0_FAN9_PWM_PCT", + "FANBOARD0_FAN9_PWM_PCT", + "FANBOARD1_FAN10_PWM_PCT", + "FANBOARD1_FAN10_PWM_PCT", + "FANBOARD1_FAN11_PWM_PCT", + "FANBOARD1_FAN11_PWM_PCT" ], "PCoefficient": 0.0, "SlewNeg": 0.0, @@ -510,7 +511,7 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.035, + "ICoefficient": -0.015, "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ diff --git a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json index 2c2e4219..1f85c97c 100644 --- a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json +++ b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json @@ -228,22 +228,22 @@ ], "Type": "ADC128D818", "in0_Max": 2.5, - "in0_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 8 CURR_A", + "in0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A", "in0_Scale": 240, "in1_Max": 2.5, - "in1_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 4 CURR_A", + "in1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A", "in1_Scale": 240, "in2_Max": 2.5, - "in2_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 0 CURR_A", + "in2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A", "in2_Scale": 240, "in3_Max": 2.5, - "in3_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 9 CURR_A", + "in3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A", "in3_Scale": 240, "in4_Max": 2.5, - "in4_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 5 CURR_A", + "in4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A", "in4_Scale": 240, "in5_Max": 2.5, - "in5_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 1 CURR_A", + "in5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A", "in5_Scale": 240, "in6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V", "in6_Scale": 31.9458, @@ -260,15 +260,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 3 ] }, "Index": 3, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -281,7 +281,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -296,28 +296,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 10 ] }, "Index": 10, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -332,15 +332,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 3 ] }, "Index": 3, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -353,7 +353,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -368,28 +368,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 10 ] }, "Index": 10, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -404,15 +404,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -425,7 +425,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -440,28 +440,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -476,15 +476,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -497,7 +497,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -512,28 +512,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -548,15 +548,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -569,7 +569,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -584,28 +584,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -620,15 +620,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -641,7 +641,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -656,28 +656,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", diff --git a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json index 0d0654f1..44b6b548 100644 --- a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json +++ b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json @@ -228,22 +228,22 @@ ], "Type": "ADC128D818", "in0_Max": 2.5, - "in0_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 8 CURR_A", + "in0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A", "in0_Scale": 300, "in1_Max": 2.5, - "in1_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 4 CURR_A", + "in1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A", "in1_Scale": 300, "in2_Max": 2.5, - "in2_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 0 CURR_A", + "in2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A", "in2_Scale": 300, "in3_Max": 2.5, - "in3_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 9 CURR_A", + "in3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A", "in3_Scale": 300, "in4_Max": 2.5, - "in4_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 5 CURR_A", + "in4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A", "in4_Scale": 300, "in5_Max": 2.5, - "in5_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 1 CURR_A", + "in5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A", "in5_Scale": 300, "in6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V", "in6_Scale": 31.9458, @@ -260,15 +260,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 3 ] }, "Index": 3, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -281,7 +281,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -296,28 +296,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 10 ] }, "Index": 10, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -332,15 +332,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 3 ] }, "Index": 3, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -368,28 +368,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 10 ] }, "Index": 10, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -404,15 +404,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -440,28 +440,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -476,15 +476,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -512,28 +512,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "Pwm": 1, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -548,15 +548,15 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -584,28 +584,28 @@ "Address": "0x20", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -620,15 +620,15 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -656,28 +656,28 @@ "Address": "0x2f", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", diff --git a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json index 9b3a8cbc..33b15911 100644 --- a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json +++ b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json @@ -10,15 +10,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -31,7 +31,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -46,28 +46,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -82,15 +82,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -103,7 +103,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -118,28 +118,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -154,15 +154,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 14 ] }, "Index": 14, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -175,7 +175,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -190,28 +190,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -226,15 +226,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 14 ] }, "Index": 14, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -247,7 +247,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -262,28 +262,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -298,15 +298,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -319,7 +319,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -334,28 +334,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 12 ] }, "Index": 12, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -370,15 +370,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -391,7 +391,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -406,28 +406,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 12 ] }, "Index": 12, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -666,22 +666,22 @@ ], "Type": "MAX11615", "in_voltage0_Max": 2.5, - "in_voltage0_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 8 CURR_A", + "in_voltage0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A", "in_voltage0_Scale": 480, "in_voltage1_Max": 2.5, - "in_voltage1_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 4 CURR_A", + "in_voltage1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A", "in_voltage1_Scale": 480, "in_voltage2_Max": 2.5, - "in_voltage2_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 0 CURR_A", + "in_voltage2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A", "in_voltage2_Scale": 480, "in_voltage3_Max": 2.5, - "in_voltage3_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 9 CURR_A", + "in_voltage3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A", "in_voltage3_Scale": 480, "in_voltage4_Max": 2.5, - "in_voltage4_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 5 CURR_A", + "in_voltage4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A", "in_voltage4_Scale": 480, "in_voltage5_Max": 2.5, - "in_voltage5_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 1 CURR_A", + "in_voltage5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A", "in_voltage5_Scale": 480, "in_voltage6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V", "in_voltage6_Scale": 63.84, diff --git a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json index 4f85163a..10712b29 100644 --- a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json +++ b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json @@ -10,15 +10,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -31,7 +31,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -46,28 +46,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -82,15 +82,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 1 ] }, "Index": 1, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -103,7 +103,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -118,28 +118,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "Pwm": 5, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT", "Tachs": [ 2 ] }, "Index": 2, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -154,15 +154,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 14 ] }, "Index": 14, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -175,7 +175,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -190,28 +190,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -226,15 +226,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 14 ] }, "Index": 14, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -247,7 +247,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -262,28 +262,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "Pwm": 2, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT", "Tachs": [ 0 ] }, "Index": 0, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -298,15 +298,15 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -319,7 +319,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -334,28 +334,28 @@ "Address": "0x21", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT", "Tachs": [ 12 ] }, "Index": 12, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -370,15 +370,15 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 9 ] }, "Index": 9, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { @@ -391,7 +391,7 @@ "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13140 + "Value": 13970 }, { "Direction": "less than", @@ -406,28 +406,28 @@ "Address": "0x23", "Bus": "$bus", "Connector": { - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "Pwm": 0, - "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT", + "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT", "Tachs": [ 12 ] }, "Index": 12, - "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM", + "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM", "PowerState": "Always", "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 15950 + "Value": 17600 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 11970 + "Value": 14080 }, { "Direction": "less than", @@ -666,22 +666,22 @@ ], "Type": "MAX11615", "in_voltage0_Max": 2.5, - "in_voltage0_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 8 CURR_A", + "in_voltage0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A", "in_voltage0_Scale": 599.88, "in_voltage1_Max": 2.5, - "in_voltage1_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 4 CURR_A", + "in_voltage1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A", "in_voltage1_Scale": 599.88, "in_voltage2_Max": 2.5, - "in_voltage2_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 0 CURR_A", + "in_voltage2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A", "in_voltage2_Scale": 599.88, "in_voltage3_Max": 2.5, - "in_voltage3_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 9 CURR_A", + "in_voltage3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A", "in_voltage3_Scale": 599.88, "in_voltage4_Max": 2.5, - "in_voltage4_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 5 CURR_A", + "in_voltage4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A", "in_voltage4_Scale": 599.88, "in_voltage5_Max": 2.5, - "in_voltage5_Name": "FANBOARD$bus % 30 ADC_48V_FAN$bus % 30 * 2 + 1 CURR_A", + "in_voltage5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A", "in_voltage5_Scale": 599.88, "in_voltage6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V", "in_voltage6_Scale": 63.84, diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json index b7d3b868..97fc6f52 100644 --- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json +++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json @@ -10,52 +10,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -149,13 +107,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -167,52 +125,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -306,13 +222,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -324,52 +240,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -463,13 +337,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -481,52 +355,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -620,13 +452,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -638,52 +470,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -777,13 +567,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -795,52 +585,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -934,13 +682,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -952,52 +700,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1091,13 +797,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1109,52 +815,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1248,13 +912,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x44", @@ -1299,7 +963,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -1436,11 +1100,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1452,10 +1116,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1484,10 +1148,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1507,14 +1171,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1533,13 +1197,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1565,7 +1229,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1579,7 +1243,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1600,7 +1264,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -1609,48 +1273,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1737,13 +1359,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x13", @@ -1755,7 +1377,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -1764,48 +1386,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1892,13 +1472,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x62", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json index e68dcb6b..9fec618f 100644 --- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json +++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json @@ -10,7 +10,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -19,48 +19,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -147,13 +105,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x12", @@ -165,7 +123,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -174,48 +132,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -302,13 +218,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x44", @@ -353,7 +269,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -490,11 +406,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -506,52 +422,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -645,13 +519,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -663,52 +537,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -802,13 +634,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -820,52 +652,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -959,13 +749,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -977,52 +767,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1116,13 +864,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1134,52 +882,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1273,13 +979,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1291,52 +997,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1430,13 +1094,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1448,52 +1112,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1587,13 +1209,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1605,52 +1227,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1744,13 +1324,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1762,10 +1342,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1794,10 +1374,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1817,14 +1397,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1843,13 +1423,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1875,7 +1455,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1889,7 +1469,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json index bfa1a796..788ac343 100644 --- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json +++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json @@ -43,7 +43,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -180,11 +180,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -196,52 +196,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -335,13 +293,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -353,52 +311,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -492,13 +408,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -510,52 +426,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -649,13 +523,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -667,52 +541,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -806,13 +638,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -824,52 +656,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -963,13 +753,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -981,52 +771,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1120,13 +868,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1138,52 +886,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1277,13 +983,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1295,52 +1001,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1434,13 +1098,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1452,10 +1116,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1484,10 +1148,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1507,14 +1171,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1533,13 +1197,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1565,7 +1229,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1579,7 +1243,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1600,7 +1264,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -1609,48 +1273,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1737,13 +1359,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x13", @@ -1755,7 +1377,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -1764,48 +1386,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1892,13 +1472,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x62", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json b/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json index 9637a51d..267561ce 100644 --- a/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json +++ b/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json @@ -10,7 +10,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -19,48 +19,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -147,13 +105,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x12", @@ -165,7 +123,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -174,48 +132,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -302,13 +218,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -320,52 +236,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -459,13 +333,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -477,52 +351,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -616,13 +448,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -634,52 +466,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -773,13 +563,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -791,52 +581,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -930,13 +678,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -948,52 +696,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1087,13 +793,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1105,52 +811,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1244,13 +908,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1262,52 +926,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1401,13 +1023,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1419,52 +1041,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1558,13 +1138,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x44", @@ -1609,7 +1189,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -1746,11 +1326,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1762,10 +1342,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1794,10 +1374,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1817,14 +1397,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1843,13 +1423,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1875,7 +1455,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1889,7 +1469,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json index e212c1b8..e8fb6fc4 100644 --- a/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json +++ b/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json @@ -64,7 +64,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -201,11 +201,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -217,50 +217,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -354,13 +312,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -372,50 +330,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -509,13 +425,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -527,50 +443,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -664,13 +538,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -682,50 +556,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -819,13 +651,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -837,50 +669,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -974,13 +764,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -992,50 +782,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1129,13 +877,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1147,50 +895,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1284,13 +990,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1302,50 +1008,8 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1439,13 +1103,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1457,10 +1121,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1489,16 +1153,16 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C", + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C", "MEDUSA_TEMP0_C", "MEDUSA_TEMP1_C" ], @@ -1519,13 +1183,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1551,7 +1215,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1565,7 +1229,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1586,7 +1250,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -1595,48 +1259,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1723,13 +1345,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x13", @@ -1741,7 +1363,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -1750,48 +1372,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1878,13 +1458,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x62", @@ -1895,7 +1475,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2011,10 +1591,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2025,7 +1605,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2141,10 +1721,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2155,7 +1735,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2271,10 +1851,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2285,7 +1865,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2401,10 +1981,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json index 3d5b395d..92ae8a2e 100644 --- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json +++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json @@ -10,52 +10,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -149,13 +107,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -167,52 +125,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -306,13 +222,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -324,52 +240,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -463,13 +337,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -481,52 +355,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -620,13 +452,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -638,52 +470,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -777,13 +567,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -795,52 +585,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -934,13 +682,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -952,52 +700,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1091,13 +797,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1109,52 +815,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1248,13 +912,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x41", @@ -1309,7 +973,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -1446,11 +1110,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1462,10 +1126,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1484,10 +1148,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1507,14 +1171,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1533,13 +1197,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1565,7 +1229,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1579,7 +1243,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1600,7 +1264,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -1609,48 +1273,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1737,13 +1359,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x13", @@ -1755,7 +1377,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -1764,48 +1386,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1892,13 +1472,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x62", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json index 4ee2d37d..423464c4 100644 --- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json +++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json @@ -10,7 +10,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -19,48 +19,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -147,13 +105,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x12", @@ -165,7 +123,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -174,48 +132,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -302,13 +218,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x41", @@ -363,7 +279,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -500,11 +416,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -516,52 +432,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -655,13 +529,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -673,52 +547,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -812,13 +644,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -830,52 +662,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -969,13 +759,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -987,52 +777,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1126,13 +874,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1144,52 +892,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1283,13 +989,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1301,52 +1007,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1440,13 +1104,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1458,52 +1122,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1597,13 +1219,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1615,52 +1237,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1754,13 +1334,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1772,10 +1352,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1794,10 +1374,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1817,14 +1397,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1843,13 +1423,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1875,7 +1455,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1889,7 +1469,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json index 6ff0be04..6b4f337b 100644 --- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json +++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json @@ -53,7 +53,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -190,11 +190,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -206,52 +206,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -345,13 +303,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -363,52 +321,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -502,13 +418,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -520,52 +436,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -659,13 +533,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -677,52 +551,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -816,13 +648,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -834,52 +666,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -973,13 +763,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -991,52 +781,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1130,13 +878,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1148,52 +896,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1287,13 +993,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1305,52 +1011,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1444,13 +1108,13 @@ } ], "Type": "MP5990", - "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_2_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_2_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1462,10 +1126,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1484,10 +1148,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1507,14 +1171,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1533,13 +1197,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1565,7 +1229,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1579,7 +1243,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1600,7 +1264,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -1609,48 +1273,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1737,13 +1359,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x13", @@ -1755,7 +1377,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -1764,48 +1386,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 71.5 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 68.25 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 3432 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3276 - }, { "Direction": "greater than", "Label": "vin", @@ -1892,13 +1472,13 @@ } ], "Type": "XDP710", - "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_2_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_2_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x62", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json b/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json index 586d5d7b..2c26d0f3 100644 --- a/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json +++ b/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json @@ -10,7 +10,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC0", + "Name": "MEDUSA_HSC0_48V", "Thresholds": [ { "Direction": "greater than", @@ -19,48 +19,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -147,13 +105,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A", + "iout1_Name": "MEDUSA_HSC0_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC0_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC0_TEMP_C", - "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC0_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC0_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC0_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC0_48V_OUTPUT_VOLT_V" }, { "Address": "0x12", @@ -165,7 +123,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_48VHSC1", + "Name": "MEDUSA_HSC1_48V", "Thresholds": [ { "Direction": "greater than", @@ -174,48 +132,6 @@ "Severity": 1, "Value": 150 }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 94 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 86.9 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 82.95 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 4512 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 4171.2 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 3981.6 - }, { "Direction": "greater than", "Label": "vin", @@ -302,13 +218,13 @@ } ], "Type": "ADM1272", - "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A", + "iout1_Name": "MEDUSA_HSC1_48V_1_CURR_A", "iout1_Scale": 250, - "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_HSC1_48V_INPUT_1_PWR_W", "pin_Scale": 250000, - "temp1_Name": "MEDUSA_48VHSC1_TEMP_C", - "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_48VHSC1_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_HSC1_48V_TEMP_C", + "vin_Name": "MEDUSA_HSC1_48V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_HSC1_48V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -320,52 +236,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB1_12VHSC", + "Name": "MEDUSA_MB1_HSC_12V", "PowerState": "ChassisOn", "SlotId": "1", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -459,13 +333,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB1_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB1_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB1_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB1_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB1_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB1_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -477,52 +351,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB2_12VHSC", + "Name": "MEDUSA_MB2_HSC_12V", "PowerState": "ChassisOn", "SlotId": "2", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -616,13 +448,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB2_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB2_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB2_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB2_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB2_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB2_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -634,52 +466,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB3_12VHSC", + "Name": "MEDUSA_MB3_HSC_12V", "PowerState": "ChassisOn", "SlotId": "3", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -773,13 +563,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB3_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB3_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB3_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB3_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB3_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB3_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -791,52 +581,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB4_12VHSC", + "Name": "MEDUSA_MB4_HSC_12V", "PowerState": "ChassisOn", "SlotId": "4", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -930,13 +678,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB4_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB4_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB4_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB4_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB4_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB4_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -948,52 +696,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB5_12VHSC", + "Name": "MEDUSA_MB5_HSC_12V", "PowerState": "ChassisOn", "SlotId": "5", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1087,13 +793,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB5_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB5_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB5_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB5_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB5_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB5_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1105,52 +811,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB6_12VHSC", + "Name": "MEDUSA_MB6_HSC_12V", "PowerState": "ChassisOn", "SlotId": "6", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1244,13 +908,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB6_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB6_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB6_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB6_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB6_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB6_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1262,52 +926,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB7_12VHSC", + "Name": "MEDUSA_MB7_HSC_12V", "PowerState": "ChassisOn", "SlotId": "7", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1401,13 +1023,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB7_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB7_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB7_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB7_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB7_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB7_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x40", @@ -1419,52 +1041,10 @@ "iout1", "pin" ], - "Name": "MEDUSA_MB8_12VHSC", + "Name": "MEDUSA_MB8_HSC_12V", "PowerState": "ChassisOn", "SlotId": "8", "Thresholds": [ - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 90 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper critical", - "Severity": 1, - "Value": 87.956 - }, - { - "Direction": "greater than", - "Label": "iout1", - "Name": "upper non critical", - "Severity": 0, - "Value": 83.958 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 1125 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper critical", - "Severity": 1, - "Value": 1099.45 - }, - { - "Direction": "greater than", - "Label": "pin", - "Name": "upper non critical", - "Severity": 0, - "Value": 1049.475 - }, { "Direction": "greater than", "Label": "temp1", @@ -1558,13 +1138,13 @@ } ], "Type": "ADM1281", - "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A", + "iout1_Name": "MEDUSA_MB8_HSC_12V_1_CURR_A", "iout1_Scale": 500, - "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W", + "pin_Name": "MEDUSA_MB8_HSC_12V_INPUT_1_PWR_W", "pin_Scale": 500000, - "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C", - "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_MB8_12VHSC_OUTPUT_VOLT_V" + "temp1_Name": "MEDUSA_MB8_HSC_12V_TEMP_C", + "vin_Name": "MEDUSA_MB8_HSC_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_MB8_HSC_12V_OUTPUT_VOLT_V" }, { "Address": "0x41", @@ -1619,7 +1199,7 @@ "iout1", "pin" ], - "Name": "MEDUSA_12VEFFUSE", + "Name": "MEDUSA_EFFUSE_12V", "Thresholds": [ { "Direction": "greater than", @@ -1756,11 +1336,11 @@ } ], "Type": "MP5023", - "iout1_Name": "MEDUSA_12VEFFUSE_CURR_A", - "pin_Name": "MEDUSA_12VEFFUSE_INPUT_PWR_W", - "temp1_Name": "MEDUSA_12VEFFUSE_TEMP_C", - "vin_Name": "MEDUSA_12VEFFUSE_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VEFFUSE_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_EFFUSE_12V_CURR_A", + "pin_Name": "MEDUSA_EFFUSE_12V_INPUT_PWR_W", + "temp1_Name": "MEDUSA_EFFUSE_12V_TEMP_C", + "vin_Name": "MEDUSA_EFFUSE_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_EFFUSE_12V_OUTPUT_VOLT_V" }, { "CheckHysteresisWithSetpoint": true, @@ -1772,10 +1352,10 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "PID_MEDUSA_12VDELTA", "NegativeHysteresis": 3.0, @@ -1794,10 +1374,10 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_0_TEMP_C", - "MEDUSA_1_TEMP_C" + "MEDUSA_HSC0_48V_TEMP_C", + "MEDUSA_HSC1_48V_TEMP_C", + "MEDUSA0_TEMP_C", + "MEDUSA1_TEMP_C" ], "Name": "Stepwise_MEDUSA_Non_Critical_Sensors", "NegativeHysteresis": 0, @@ -1817,14 +1397,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C" + "MEDUSA_MB1_HSC_12V_TEMP_C", + "MEDUSA_MB2_HSC_12V_TEMP_C", + "MEDUSA_MB3_HSC_12V_TEMP_C", + "MEDUSA_MB4_HSC_12V_TEMP_C", + "MEDUSA_MB5_HSC_12V_TEMP_C", + "MEDUSA_MB6_HSC_12V_TEMP_C", + "MEDUSA_MB7_HSC_12V_TEMP_C", + "MEDUSA_MB8_HSC_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_MB_12VHSC", "NegativeHysteresis": 0, @@ -1843,13 +1423,13 @@ { "Class": "temp", "Inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" + "MEDUSA_DELTA0_12V_TEMP_C", + "MEDUSA_DELTA1_12V_TEMP_C", + "MEDUSA_DELTA2_12V_TEMP_C", + "MEDUSA_DELTA3_12V_TEMP_C" ], "Name": "Stepwise_MEDUSA_12VDELTA", - "NegativeHysteresis": 3, + "NegativeHysteresis": 2, "Output": [ 20.0, 22.0, @@ -1875,7 +1455,7 @@ { "Address": "0x48", "Bus": 11, - "Name": "MEDUSA_0_TEMP_C", + "Name": "MEDUSA0_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1889,7 +1469,7 @@ { "Address": "0x49", "Bus": 11, - "Name": "MEDUSA_1_TEMP_C", + "Name": "MEDUSA1_TEMP_C", "Thresholds": [ { "Direction": "greater than", @@ -1909,7 +1489,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA0", + "Name": "MEDUSA_DELTA0_12V", "Thresholds": [ { "Direction": "greater than", @@ -2025,10 +1605,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA0_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA0_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA0_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA0_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA0_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA0_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA0_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA0_12V_OUTPUT_VOLT_V" }, { "Address": "0x64", @@ -2039,7 +1619,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA1", + "Name": "MEDUSA_DELTA1_12V", "Thresholds": [ { "Direction": "greater than", @@ -2155,10 +1735,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA1_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA1_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA1_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA1_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA1_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA1_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA1_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA1_12V_OUTPUT_VOLT_V" }, { "Address": "0x65", @@ -2169,7 +1749,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA2", + "Name": "MEDUSA_DELTA2_12V", "Thresholds": [ { "Direction": "greater than", @@ -2285,10 +1865,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA2_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA2_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA2_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA2_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA2_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA2_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA2_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA2_12V_OUTPUT_VOLT_V" }, { "Address": "0x68", @@ -2299,7 +1879,7 @@ "vout1", "iout1" ], - "Name": "MEDUSA_12VDELTA3", + "Name": "MEDUSA_DELTA3_12V", "Thresholds": [ { "Direction": "greater than", @@ -2415,10 +1995,10 @@ } ], "Type": "pmbus", - "iout1_Name": "MEDUSA_12VDELTA3_CURR_A", - "temp1_Name": "MEDUSA_12VDELTA3_TEMP_C", - "vin_Name": "MEDUSA_12VDELTA3_INPUT_VOLT_V", - "vout1_Name": "MEDUSA_12VDELTA3_OUTPUT_VOLT_V" + "iout1_Name": "MEDUSA_DELTA3_12V_CURR_A", + "temp1_Name": "MEDUSA_DELTA3_12V_TEMP_C", + "vin_Name": "MEDUSA_DELTA3_12V_INPUT_VOLT_V", + "vout1_Name": "MEDUSA_DELTA3_12V_OUTPUT_VOLT_V" } ], "Name": "Yosemite 4 Medusa Board", diff --git a/configurations/yosemite4_sentineldome_chassis.json b/configurations/yosemite4_sentineldome_chassis.json index 76a1ff22..b4932df7 100644 --- a/configurations/yosemite4_sentineldome_chassis.json +++ b/configurations/yosemite4_sentineldome_chassis.json @@ -10,6 +10,9 @@ "SerialNumber": "$PRODUCT_SERIAL_NUMBER", "SparePartNumber": "$PRODUCT_INFO_AM1" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "HostIndex": "$bus % 15" + }, "xyz.openbmc_project.Inventory.Decorator.Slot": { "SlotNumber": "$bus % 15" } diff --git a/configurations/yosemite4_sentineldome_t1.json b/configurations/yosemite4_sentineldome_t1.json index 6c0096bc..251ca224 100644 --- a/configurations/yosemite4_sentineldome_t1.json +++ b/configurations/yosemite4_sentineldome_t1.json @@ -11,16 +11,16 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C" ], "Name": "PID_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -47,7 +47,7 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "PID_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -69,18 +69,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "PID_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -101,11 +101,11 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "PID_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -125,8 +125,8 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_INLET_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_OUTLET_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_INLET_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_OUTLET_TEMP_C" ], "Name": "Stepwise_MB_INLET_OUTLET_TEMP_Slot $bus % 15", "NegativeHysteresis": 0, @@ -146,10 +146,10 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Calibrated_Sentinel_Dome_Slot $bus % 15 MB_FIO_TEMP_C" + "CALIBRATED_SENTINEL_DOME_SLOT $bus % 15 MB_FIO_TEMP_C" ], "Name": "Stepwise_MB_FIO_Slot $bus % 15", - "NegativeHysteresis": 2, + "NegativeHysteresis": 1, "Output": [ 20.0, 21.0, @@ -162,15 +162,15 @@ 28.0, 29.0, 30.0, - 31.0, - 31.0, + 32.0, 33.0, 35.0, 37.0, 38.0, 39.0, 40.0, - 41.0 + 41.0, + 42.0 ], "PositiveHysteresis": 0, "Reading": [ @@ -186,14 +186,14 @@ 29.0, 30.0, 31.0, - 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, - 39.0 + 39.0, + 40.0 ], "Type": "Stepwise", "Zones": [ @@ -204,16 +204,16 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C" ], "Name": "Stepwise_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2, @@ -243,7 +243,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "Stepwise_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3, @@ -279,7 +279,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "Stepwise_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2, @@ -309,11 +309,11 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "Stepwise_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3, @@ -354,6 +354,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "HostIndex": "$bus % 15" + }, "xyz.openbmc_project.Inventory.Decorator.Revision": { "Version": "$PRODUCT_VERSION" }, diff --git a/configurations/yosemite4_sentineldome_t1_retimer.json b/configurations/yosemite4_sentineldome_t1_retimer.json index 6bf37b44..804aa26f 100644 --- a/configurations/yosemite4_sentineldome_t1_retimer.json +++ b/configurations/yosemite4_sentineldome_t1_retimer.json @@ -10,7 +10,7 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RTM_TEMP_C" ], "Name": "PID_MB_RETIMER_TEMP_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -37,16 +37,16 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C" ], "Name": "PID_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -73,7 +73,7 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "PID_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -95,18 +95,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "PID_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -127,11 +127,11 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "PID_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -151,8 +151,8 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_INLET_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_OUTLET_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_INLET_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_OUTLET_TEMP_C" ], "Name": "Stepwise_MB_INLET_OUTLET_TEMP_Slot $bus % 15", "NegativeHysteresis": 0, @@ -172,7 +172,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RTM_TEMP_C" ], "Name": "Stepwise_MB_RETIMER_TEMP_Slot $bus % 15", "NegativeHysteresis": 2, @@ -206,10 +206,10 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Calibrated_Sentinel_Dome_Slot $bus % 15 MB_FIO_TEMP_C" + "CALIBRATED_SENTINEL_DOME_SLOT $bus % 15 MB_FIO_TEMP_C" ], "Name": "Stepwise_MB_FIO_Slot $bus % 15", - "NegativeHysteresis": 2, + "NegativeHysteresis": 1, "Output": [ 20.0, 21.0, @@ -222,15 +222,15 @@ 28.0, 29.0, 30.0, - 31.0, - 31.0, + 32.0, 33.0, 35.0, 37.0, 38.0, 39.0, 40.0, - 41.0 + 41.0, + 42.0 ], "PositiveHysteresis": 0, "Reading": [ @@ -246,14 +246,14 @@ 29.0, 30.0, 31.0, - 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, - 39.0 + 39.0, + 40.0 ], "Type": "Stepwise", "Zones": [ @@ -264,16 +264,16 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C" ], "Name": "Stepwise_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2, @@ -303,7 +303,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "Stepwise_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3, @@ -339,7 +339,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "Stepwise_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2, @@ -369,11 +369,11 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "Stepwise_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3, @@ -414,6 +414,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "HostIndex": "$bus % 15" + }, "xyz.openbmc_project.Inventory.Decorator.Revision": { "Version": "$PRODUCT_VERSION" }, diff --git a/configurations/yosemite4_sentineldome_t2.json b/configurations/yosemite4_sentineldome_t2.json index 322e4008..713fe60b 100644 --- a/configurations/yosemite4_sentineldome_t2.json +++ b/configurations/yosemite4_sentineldome_t2.json @@ -11,18 +11,18 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C" ], "Name": "PID_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -49,7 +49,7 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "PID_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -71,18 +71,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "PID_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -98,18 +98,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C" ], "Name": "PID_MB_SSD_DATA_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -130,11 +130,11 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "PID_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -154,8 +154,8 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_INLET_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_OUTLET_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_INLET_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_OUTLET_TEMP_C" ], "Name": "Stepwise_MB_INLET_OUTLET_TEMP_Slot $bus % 15", "NegativeHysteresis": 0, @@ -175,10 +175,10 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Calibrated_Sentinel_Dome_Slot $bus % 15 MB_FIO_TEMP_C" + "CALIBRATED_SENTINEL_DOME_SLOT $bus % 15 MB_FIO_TEMP_C" ], "Name": "Stepwise_MB_FIO_Slot $bus % 15", - "NegativeHysteresis": 2, + "NegativeHysteresis": 1, "Output": [ 20.0, 21.0, @@ -191,15 +191,15 @@ 28.0, 29.0, 30.0, - 31.0, - 31.0, + 32.0, 33.0, 35.0, 37.0, 38.0, 39.0, 40.0, - 41.0 + 41.0, + 42.0 ], "PositiveHysteresis": 0, "Reading": [ @@ -215,14 +215,14 @@ 29.0, 30.0, 31.0, - 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, - 39.0 + 39.0, + 40.0 ], "Type": "Stepwise", "Zones": [ @@ -233,18 +233,18 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C" ], "Name": "Stepwise_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2, @@ -274,7 +274,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "Stepwise_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3, @@ -310,7 +310,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "Stepwise_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2, @@ -340,7 +340,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C" ], "Name": "Stepwise_MB_SSD_DATA_Slot $bus % 15", "NegativeHysteresis": 2, @@ -370,11 +370,11 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "Stepwise_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3, @@ -415,6 +415,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "HostIndex": "$bus % 15" + }, "xyz.openbmc_project.Inventory.Decorator.Revision": { "Version": "$PRODUCT_VERSION" }, diff --git a/configurations/yosemite4_sentineldome_t2_retimer.json b/configurations/yosemite4_sentineldome_t2_retimer.json index 74695e75..2d2e494b 100644 --- a/configurations/yosemite4_sentineldome_t2_retimer.json +++ b/configurations/yosemite4_sentineldome_t2_retimer.json @@ -10,7 +10,7 @@ "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RTM_TEMP_C" ], "Name": "PID_MB_RETIMER_TEMP_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -37,18 +37,18 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C" ], "Name": "PID_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -75,7 +75,7 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "PID_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -97,18 +97,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "PID_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -124,18 +124,18 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.02, + "ICoefficient": -0.035, "ILimitMax": 100, "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C" ], "Name": "PID_MB_SSD_DATA_Slot $bus % 15", "NegativeHysteresis": 2.0, "OutLimitMax": 100, "OutLimitMin": 0, - "PCoefficient": -1.5, + "PCoefficient": -5.5, "PositiveHysteresis": 0.0, "SetPoint": 68.0, "SlewNeg": 0.0, @@ -156,11 +156,11 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "PID_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -180,8 +180,8 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_INLET_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_OUTLET_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_INLET_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_OUTLET_TEMP_C" ], "Name": "Stepwise_MB_INLET_OUTLET_TEMP_Slot $bus % 15", "NegativeHysteresis": 0, @@ -201,7 +201,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RTM_TEMP_C" ], "Name": "Stepwise_MB_RETIMER_TEMP_Slot $bus % 15", "NegativeHysteresis": 2, @@ -235,10 +235,10 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Calibrated_Sentinel_Dome_Slot $bus % 15 MB_FIO_TEMP_C" + "CALIBRATED_SENTINEL_DOME_SLOT $bus % 15 MB_FIO_TEMP_C" ], "Name": "Stepwise_MB_FIO_Slot $bus % 15", - "NegativeHysteresis": 2, + "NegativeHysteresis": 1, "Output": [ 20.0, 21.0, @@ -251,15 +251,15 @@ 28.0, 29.0, 30.0, - 31.0, - 31.0, + 32.0, 33.0, 35.0, 37.0, 38.0, 39.0, 40.0, - 41.0 + 41.0, + 42.0 ], "PositiveHysteresis": 0, "Reading": [ @@ -275,14 +275,14 @@ 29.0, 30.0, 31.0, - 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, - 39.0 + 39.0, + 40.0 ], "Type": "Stepwise", "Zones": [ @@ -293,18 +293,18 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C" ], "Name": "Stepwise_MB_DIMM_Slot $bus % 15", "NegativeHysteresis": 2, @@ -334,7 +334,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C" ], "Name": "Stepwise_MB_CPU_Slot $bus % 15", "NegativeHysteresis": 3, @@ -370,7 +370,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C" ], "Name": "Stepwise_MB_SSD_BOOT_Slot $bus % 15", "NegativeHysteresis": 2, @@ -400,7 +400,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C" ], "Name": "Stepwise_MB_SSD_DATA_Slot $bus % 15", "NegativeHysteresis": 2, @@ -430,11 +430,11 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C", - "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C" + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C", + "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C" ], "Name": "Stepwise_MB_VR_Slot $bus % 15", "NegativeHysteresis": 3, @@ -475,6 +475,9 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "HostIndex": "$bus % 15" + }, "xyz.openbmc_project.Inventory.Decorator.Revision": { "Version": "$PRODUCT_VERSION" }, diff --git a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json index 2cc93a95..32f1a4db 100644 --- a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json +++ b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json @@ -8,7 +8,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_STBY", + "Name": "SPIDER_PMON_12V_STBY", "Thresholds": [ { "Direction": "greater than", @@ -96,9 +96,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_STBY_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_STBY_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_STBY_VOLT_V" + "iout1_Name": "SPIDER_PMON_12V_STBY_CURR_A", + "pout1_Name": "SPIDER_PMON_12V_STBY_PWR_W", + "vout1_Name": "SPIDER_PMON_12V_STBY_VOLT_V" }, { "Address": "0x41", @@ -108,7 +108,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC0", + "Name": "SPIDER_PMON_NIC0_12V", "Thresholds": [ { "Direction": "greater than", @@ -196,9 +196,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC0_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC0_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC0_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC0_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC0_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V" }, { "Address": "0x42", @@ -208,7 +208,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC1", + "Name": "SPIDER_PMON_NIC1_12V", "Thresholds": [ { "Direction": "greater than", @@ -296,9 +296,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC1_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC1_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC1_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC1_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC1_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V" }, { "Address": "0x43", @@ -308,7 +308,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC2", + "Name": "SPIDER_PMON_NIC2_12V", "Thresholds": [ { "Direction": "greater than", @@ -396,9 +396,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC2_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC2_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC2_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC2_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC2_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V" }, { "Address": "0x44", @@ -408,7 +408,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC3", + "Name": "SPIDER_PMON_NIC3_12V", "Thresholds": [ { "Direction": "greater than", @@ -496,9 +496,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC3_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC3_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC3_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC3_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC3_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V" }, { "Address": "0x35", @@ -681,13 +681,13 @@ } ], "Type": "MAX11617", - "in_voltage0_Name": "SPIDER_ADC_12V_NIC0_VOLT_V", + "in_voltage0_Name": "SPIDER_ADC_NIC0_12V_VOLT_V", "in_voltage0_Scale": 224.7192, - "in_voltage1_Name": "SPIDER_ADC_3V3_NIC0_VOLT_V", + "in_voltage1_Name": "SPIDER_ADC_NIC0_3V3_VOLT_V", "in_voltage1_Scale": 821.3552, - "in_voltage2_Name": "SPIDER_ADC_12V_NIC1_VOLT_V", + "in_voltage2_Name": "SPIDER_ADC_NIC1_12V_VOLT_V", "in_voltage2_Scale": 224.7192, - "in_voltage3_Name": "SPIDER_ADC_3V3_NIC1_VOLT_V", + "in_voltage3_Name": "SPIDER_ADC_NIC1_3V3_VOLT_V", "in_voltage3_Scale": 821.3552 }, { @@ -957,15 +957,15 @@ } ], "Type": "MAX11617", - "in_voltage0_Name": "SPIDER_ADC_12V_NIC2_VOLT_V", + "in_voltage0_Name": "SPIDER_ADC_NIC2_12V_VOLT_V", "in_voltage0_Scale": 224.7192, - "in_voltage1_Name": "SPIDER_ADC_3V3_NIC2_VOLT_V", + "in_voltage1_Name": "SPIDER_ADC_NIC2_3V3_VOLT_V", "in_voltage1_Scale": 821.3552, - "in_voltage2_Name": "SPIDER_ADC_12V_NIC3_VOLT_V", + "in_voltage2_Name": "SPIDER_ADC_NIC3_12V_VOLT_V", "in_voltage2_Scale": 224.7192, - "in_voltage3_Name": "SPIDER_ADC_3V3_NIC3_VOLT_V", + "in_voltage3_Name": "SPIDER_ADC_NIC3_3V3_VOLT_V", "in_voltage3_Scale": 821.3552, - "in_voltage8_Name": "SPIDER_ADC_12V_MEDUSA_AUX_VOLT_V", + "in_voltage8_Name": "SPIDER_ADC_MEDUSA_12V_AUX_VOLT_V", "in_voltage8_Scale": 224.7192, "in_voltage9_Name": "SPIDER_ADC_3V3_AUX_VOLT_V", "in_voltage9_Scale": 821.3552 @@ -973,8 +973,8 @@ { "Class": "temp", "Inputs": [ - "SPIDER_0_TEMP_C", - "SPIDER_1_TEMP_C" + "SPIDER0_TEMP_C", + "SPIDER1_TEMP_C" ], "Name": "Stepwise_SPIDER_TEMP", "NegativeHysteresis": 0, @@ -993,13 +993,19 @@ { "Address": "0x4e", "Bus": 14, - "Name": "SPIDER_0_TEMP_C", + "Name": "SPIDER0_TEMP_C", "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper non recoverable", + "Severity": 4, + "Value": 150 + }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 50 + "Value": 60 } ], "Type": "TMP75" @@ -1007,13 +1013,19 @@ { "Address": "0x4f", "Bus": 14, - "Name": "SPIDER_1_TEMP_C", + "Name": "SPIDER1_TEMP_C", "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper non recoverable", + "Severity": 4, + "Value": 150 + }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 50 + "Value": 60 } ], "Type": "TMP75" diff --git a/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json index 4b15436d..e45ff28f 100644 --- a/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json +++ b/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json @@ -181,13 +181,13 @@ } ], "Type": "ADC128D818", - "in0_Name": "SPIDER_ADC_12V_NIC0_VOLT_V", + "in0_Name": "SPIDER_ADC_NIC0_12V_VOLT_V", "in0_Scale": 112.3596, - "in1_Name": "SPIDER_ADC_3V3_NIC0_VOLT_V", + "in1_Name": "SPIDER_ADC_NIC0_3V3_VOLT_V", "in1_Scale": 410.6776, - "in2_Name": "SPIDER_ADC_12V_NIC1_VOLT_V", + "in2_Name": "SPIDER_ADC_NIC1_12V_VOLT_V", "in2_Scale": 112.3596, - "in3_Name": "SPIDER_ADC_3V3_NIC1_VOLT_V", + "in3_Name": "SPIDER_ADC_NIC1_3V3_VOLT_V", "in3_Scale": 410.6776 }, { @@ -285,7 +285,7 @@ } ], "Type": "ADC128D818", - "in0_Name": "SPIDER_ADC_12V_MEDUSA_AUX_VOLT_V", + "in0_Name": "SPIDER_ADC_MEDUSA_12V_AUX_VOLT_V", "in0_Scale": 112.3596, "in1_Name": "SPIDER_ADC_3V3_AUX_VOLT_V", "in1_Scale": 410.6776 @@ -471,13 +471,13 @@ } ], "Type": "ADC128D818", - "in0_Name": "SPIDER_ADC_12V_NIC2_VOLT_V", + "in0_Name": "SPIDER_ADC_NIC2_12V_VOLT_V", "in0_Scale": 112.3596, - "in1_Name": "SPIDER_ADC_3V3_NIC2_VOLT_V", + "in1_Name": "SPIDER_ADC_NIC2_3V3_VOLT_V", "in1_Scale": 410.6776, - "in2_Name": "SPIDER_ADC_12V_NIC3_VOLT_V", + "in2_Name": "SPIDER_ADC_NIC3_12V_VOLT_V", "in2_Scale": 112.3596, - "in3_Name": "SPIDER_ADC_3V3_NIC3_VOLT_V", + "in3_Name": "SPIDER_ADC_NIC3_3V3_VOLT_V", "in3_Scale": 410.6776 }, { @@ -488,7 +488,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_STBY", + "Name": "SPIDER_PMON_12V_STBY", "Thresholds": [ { "Direction": "greater than", @@ -576,9 +576,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_STBY_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_STBY_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_STBY_VOLT_V" + "iout1_Name": "SPIDER_PMON_12V_STBY_CURR_A", + "pout1_Name": "SPIDER_PMON_12V_STBY_PWR_W", + "vout1_Name": "SPIDER_PMON_12V_STBY_VOLT_V" }, { "Address": "0x41", @@ -588,7 +588,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC0", + "Name": "SPIDER_PMON_NIC0_12V", "Thresholds": [ { "Direction": "greater than", @@ -676,9 +676,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC0_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC0_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC0_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC0_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC0_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V" }, { "Address": "0x42", @@ -688,7 +688,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC1", + "Name": "SPIDER_PMON_NIC1_12V", "Thresholds": [ { "Direction": "greater than", @@ -776,9 +776,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC1_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC1_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC1_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC1_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC1_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V" }, { "Address": "0x43", @@ -788,7 +788,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC2", + "Name": "SPIDER_PMON_NIC2_12V", "Thresholds": [ { "Direction": "greater than", @@ -876,9 +876,9 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC2_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC2_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC2_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC2_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC2_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V" }, { "Address": "0x44", @@ -888,7 +888,7 @@ "iout1", "pout1" ], - "Name": "SPIDER_INA233_12V_NIC3", + "Name": "SPIDER_PMON_NIC3_12V", "Thresholds": [ { "Direction": "greater than", @@ -976,15 +976,15 @@ } ], "Type": "INA233", - "iout1_Name": "SPIDER_INA233_12V_NIC3_CURR_A", - "pout1_Name": "SPIDER_INA233_12V_NIC3_PWR_W", - "vout1_Name": "SPIDER_INA233_12V_NIC3_VOLT_V" + "iout1_Name": "SPIDER_PMON_NIC3_12V_CURR_A", + "pout1_Name": "SPIDER_PMON_NIC3_12V_PWR_W", + "vout1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V" }, { "Class": "temp", "Inputs": [ - "SPIDER_0_TEMP_C", - "SPIDER_1_TEMP_C" + "SPIDER0_TEMP_C", + "SPIDER1_TEMP_C" ], "Name": "Stepwise_SPIDER_TEMP", "NegativeHysteresis": 0, @@ -1003,13 +1003,19 @@ { "Address": "0x4e", "Bus": 14, - "Name": "SPIDER_0_TEMP_C", + "Name": "SPIDER0_TEMP_C", "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper non recoverable", + "Severity": 4, + "Value": 150 + }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 50 + "Value": 60 } ], "Type": "TMP75" @@ -1017,13 +1023,19 @@ { "Address": "0x4f", "Bus": 14, - "Name": "SPIDER_1_TEMP_C", + "Name": "SPIDER1_TEMP_C", "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper non recoverable", + "Severity": 4, + "Value": 150 + }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 50 + "Value": 60 } ], "Type": "TMP75" diff --git a/configurations/yosemite4_wailuafalls.json b/configurations/yosemite4_wailuafalls.json index 9ba7fd9d..6790d8b3 100644 --- a/configurations/yosemite4_wailuafalls.json +++ b/configurations/yosemite4_wailuafalls.json @@ -1,5 +1,39 @@ { "Exposes": [ + { + "CheckHysteresisWithSetpoint": true, + "Class": "temp", + "DCoefficient": 0.0, + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -0.02, + "ILimitMax": 100, + "ILimitMin": -50, + "InputUnavailableAsFailed": false, + "Inputs": [ + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_P0V8_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_PVDDQ_CD_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_P0V85_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_PVDDQ_AB_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_P0V8_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_PVDDQ_CD_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_P0V85_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_PVDDQ_AB_TEMP_C" + ], + "Name": "PID_WF_VR_Slot $bus % 15", + "NegativeHysteresis": 3.0, + "OutLimitMax": 100, + "OutLimitMin": 0, + "PCoefficient": -3.0, + "PositiveHysteresis": 0.0, + "SetPoint": 90.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Zone 1" + ] + }, { "CheckHysteresisWithSetpoint": true, "Class": "temp", @@ -11,14 +45,14 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_A_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_B_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_C_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_D_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_A_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_B_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_C_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_D_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_A_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_B_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_C_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_D_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_A_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_B_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_C_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_D_TEMP_C" ], "Name": "PID_WF_DIMM_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -45,7 +79,7 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_E1S_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_E1S_TEMP_C" ], "Name": "PID_WF_E1S_Slot $bus % 15", "NegativeHysteresis": 2.0, @@ -72,8 +106,8 @@ "ILimitMin": -50, "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_CXL1_CNTR_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_CXL2_CNTR_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_CXL1_CNTR_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_CXL2_CNTR_TEMP_C" ], "Name": "PID_WF_CXL_Slot $bus % 15", "NegativeHysteresis": 3.0, @@ -93,24 +127,33 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_1OU_BOARD_INLET_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_P0V8_ASIC1_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_PVDDQ_CD_ASIC1_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_P0V85_ASIC1_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_PVDDQ_AB_ASIC1_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_P0V8_ASIC2_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_PVDDQ_CD_ASIC2_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_P0V85_ASIC2_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_VR_PVDDQ_AB_ASIC2_TEMP_C" - ], - "Name": "Stepwise_WF_Non_Critical_Sensors_Slot $bus % 15", - "NegativeHysteresis": 0, + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_P0V8_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_PVDDQ_CD_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_P0V85_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC1_PVDDQ_AB_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_P0V8_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_PVDDQ_CD_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_P0V85_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_VR_ASIC2_PVDDQ_AB_TEMP_C" + ], + "Name": "Stepwise_WF_VR_Slot $bus % 15", + "NegativeHysteresis": 3, "Output": [ - 20.0 + 20.0, + 22.0, + 24.0, + 26.0, + 28.0, + 30.0 ], "PositiveHysteresis": 0, "Reading": [ - 20.0 + 80.0, + 81.0, + 82.0, + 83.0, + 84.0, + 85.0 ], "Type": "Stepwise", "Zones": [ @@ -121,14 +164,14 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_A_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_B_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_C_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC1_DIMM_D_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_A_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_B_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_C_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_ASIC2_DIMM_D_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_A_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_B_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_C_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC1_DIMM_D_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_A_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_B_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_C_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_ASIC2_DIMM_D_TEMP_C" ], "Name": "Stepwise_WF_DIMM_Slot $bus % 15", "NegativeHysteresis": 2, @@ -158,7 +201,7 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_E1S_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_E1S_TEMP_C" ], "Name": "Stepwise_WF_E1S_Slot $bus % 15", "NegativeHysteresis": 2, @@ -188,8 +231,8 @@ "Class": "temp", "InputUnavailableAsFailed": false, "Inputs": [ - "Wailua_Falls_Slot $bus % 15 WF_CXL1_CNTR_TEMP_C", - "Wailua_Falls_Slot $bus % 15 WF_CXL2_CNTR_TEMP_C" + "WAILUA_FALLS_SLOT $bus % 15 WF_CXL1_CNTR_TEMP_C", + "WAILUA_FALLS_SLOT $bus % 15 WF_CXL2_CNTR_TEMP_C" ], "Name": "Stepwise_WF_CXL_Slot $bus % 15", "NegativeHysteresis": 2, diff --git a/configurations/yosemite4n.json b/configurations/yosemite4n.json index d3dad76b..073bd294 100644 --- a/configurations/yosemite4n.json +++ b/configurations/yosemite4n.json @@ -2,7 +2,7 @@ "Exposes": [ { "Index": 0, - "Name": "MGNT_P12V_VOLT_V", + "Name": "MGNT_ADC_P12V_VOLT_V", "ScaleFactor": 0.1124, "Thresholds": [ { @@ -48,7 +48,7 @@ }, { "Index": 1, - "Name": "MGNT_P5V_VOLT_V", + "Name": "MGNT_ADC_P5V_VOLT_V", "ScaleFactor": 0.2717, "Thresholds": [ { @@ -92,7 +92,7 @@ }, { "Index": 2, - "Name": "MGNT_P3V3_VOLT_V", + "Name": "MGNT_ADC_P3V3_VOLT_V", "ScaleFactor": 0.4107, "Thresholds": [ { @@ -136,7 +136,7 @@ }, { "Index": 3, - "Name": "MGNT_P2V5_VOLT_V", + "Name": "MGNT_ADC_P2V5_VOLT_V", "ScaleFactor": 0.542, "Thresholds": [ { @@ -168,160 +168,160 @@ }, { "Index": 4, - "Name": "MGNT_P1V2_VOLT_V", - "ScaleFactor": 1, + "Name": "MGNT_ADC_P5V_USB_VOLT_V", + "ScaleFactor": 0.2717, "Thresholds": [ { "Direction": "greater than", "Name": "upper non recoverable", "Severity": 4, - "Value": 1.356 + "Value": 5.5 }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 1.296 + "Value": 5.4 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 1.284 + "Value": 5.35 }, { "Direction": "less than", "Name": "lower non critical", "Severity": 0, - "Value": 1.116 + "Value": 4.65 }, { "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 1.104 + "Value": 4.6 }, { "Direction": "less than", "Name": "lower non recoverable", "Severity": 4, - "Value": 0.996 + "Value": 4.15 } ], "Type": "ADC" }, { - "BridgeGpio": [ - { - "Name": "EN_P3V_BAT_SCALED_R", - "Polarity": "H", - "SetupTime": 1 - } - ], "Index": 5, - "Name": "MGNT_P3V_BAT_VOLT_V", - "PollRate": 3600, - "ScaleFactor": 0.3333, + "Name": "MGNT_ADC_P1V2_VOLT_V", + "ScaleFactor": 1, "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper non recoverable", + "Severity": 4, + "Value": 1.356 + }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 3.502 + "Value": 1.296 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 3.468 + "Value": 1.284 }, { "Direction": "less than", "Name": "lower non critical", "Severity": 0, - "Value": 2.793 + "Value": 1.116 }, { "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 2.765 + "Value": 1.104 + }, + { + "Direction": "less than", + "Name": "lower non recoverable", + "Severity": 4, + "Value": 0.996 } ], "Type": "ADC" }, { + "BridgeGpio": [ + { + "Name": "EN_P3V_BAT_SCALED_R", + "Polarity": "H", + "SetupTime": 1 + } + ], "Index": 6, - "Name": "MGNT_P1V07_BMC_VOLT_V", - "ScaleFactor": 1, + "Name": "MGNT_ADC_P3V_BAT_VOLT_V", + "PollRate": 3600, + "ScaleFactor": 0.3333, "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 1.156 + "Value": 3.502 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 1.145 + "Value": 3.468 }, { "Direction": "less than", "Name": "lower non critical", "Severity": 0, - "Value": 0.995 + "Value": 2.793 }, { "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 0.984 + "Value": 2.765 } ], "Type": "ADC" }, { "Index": 7, - "Name": "MGNT_P5V_USB_VOLT_V", - "ScaleFactor": 0.2717, + "Name": "MGNT_ADC_P1V07_BMC_VOLT_V", + "ScaleFactor": 1, "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper non recoverable", - "Severity": 4, - "Value": 5.5 - }, { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 5.4 + "Value": 1.156 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 5.35 + "Value": 1.145 }, { "Direction": "less than", "Name": "lower non critical", "Severity": 0, - "Value": 4.65 + "Value": 0.995 }, { "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 4.6 - }, - { - "Direction": "less than", - "Name": "lower non recoverable", - "Severity": 4, - "Value": 4.15 + "Value": 0.984 } ], "Type": "ADC" @@ -364,7 +364,7 @@ } ], "Type": "ADC128D818", - "in0_Name": "MGNT_P1V8_VOLT_V", + "in0_Name": "MGNT_ADC_P1V8_VOLT_V", "in0_Scale": 824.561 }, { @@ -405,70 +405,71 @@ } ], "Type": "MAX11615", - "in_voltage0_Name": "MGNT_P1V8_VOLT_V", + "in_voltage0_Name": "MGNT_ADC_P1V8_VOLT_V", "in_voltage0_Scale": 1649.122 }, { "Class": "fan", "FFGainCoefficient": 1.0, "FFOffCoefficient": 0.0, + "FailSafePercent": 80.0, "ICoefficient": 0.0, "ILimitMax": 0.0, "ILimitMin": 0.0, "Inputs": [ - "FANBOARD0_FAN0_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN0_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN1_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN1_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN2_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN2_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN3_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN3_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN4_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN4_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN5_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN5_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN6_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN6_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN7_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN7_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN8_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN8_TACH_OL_SPEED_RPM", - "FANBOARD0_FAN9_TACH_IL_SPEED_RPM", - "FANBOARD0_FAN9_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN10_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN10_TACH_OL_SPEED_RPM", - "FANBOARD1_FAN11_TACH_IL_SPEED_RPM", - "FANBOARD1_FAN11_TACH_OL_SPEED_RPM" + "FANBOARD0_FAN0_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN0_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN1_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN1_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN2_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN2_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN3_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN3_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN4_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN4_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN5_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN5_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN6_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN6_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN7_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN7_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN8_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN8_TACH_OUTLET_SPEED_RPM", + "FANBOARD0_FAN9_TACH_INLET_SPEED_RPM", + "FANBOARD0_FAN9_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN10_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN10_TACH_OUTLET_SPEED_RPM", + "FANBOARD1_FAN11_TACH_INLET_SPEED_RPM", + "FANBOARD1_FAN11_TACH_OUTLET_SPEED_RPM" ], "Name": "All Fan", "OutLimitMax": 100.0, "OutLimitMin": 0.0, "Outputs": [ - "FANBOARD0_FAN0_PWM_TACH_PCT", - "FANBOARD0_FAN0_PWM_TACH_PCT", - "FANBOARD0_FAN1_PWM_TACH_PCT", - "FANBOARD0_FAN1_PWM_TACH_PCT", - "FANBOARD1_FAN2_PWM_TACH_PCT", - "FANBOARD1_FAN2_PWM_TACH_PCT", - "FANBOARD1_FAN3_PWM_TACH_PCT", - "FANBOARD1_FAN3_PWM_TACH_PCT", - "FANBOARD0_FAN4_PWM_TACH_PCT", - "FANBOARD0_FAN4_PWM_TACH_PCT", - "FANBOARD0_FAN5_PWM_TACH_PCT", - "FANBOARD0_FAN5_PWM_TACH_PCT", - "FANBOARD1_FAN6_PWM_TACH_PCT", - "FANBOARD1_FAN6_PWM_TACH_PCT", - "FANBOARD1_FAN7_PWM_TACH_PCT", - "FANBOARD1_FAN7_PWM_TACH_PCT", - "FANBOARD0_FAN8_PWM_TACH_PCT", - "FANBOARD0_FAN8_PWM_TACH_PCT", - "FANBOARD0_FAN9_PWM_TACH_PCT", - "FANBOARD0_FAN9_PWM_TACH_PCT", - "FANBOARD1_FAN10_PWM_TACH_PCT", - "FANBOARD1_FAN10_PWM_TACH_PCT", - "FANBOARD1_FAN11_PWM_TACH_PCT", - "FANBOARD1_FAN11_PWM_TACH_PCT" + "FANBOARD0_FAN0_PWM_PCT", + "FANBOARD0_FAN0_PWM_PCT", + "FANBOARD0_FAN1_PWM_PCT", + "FANBOARD0_FAN1_PWM_PCT", + "FANBOARD1_FAN2_PWM_PCT", + "FANBOARD1_FAN2_PWM_PCT", + "FANBOARD1_FAN3_PWM_PCT", + "FANBOARD1_FAN3_PWM_PCT", + "FANBOARD0_FAN4_PWM_PCT", + "FANBOARD0_FAN4_PWM_PCT", + "FANBOARD0_FAN5_PWM_PCT", + "FANBOARD0_FAN5_PWM_PCT", + "FANBOARD1_FAN6_PWM_PCT", + "FANBOARD1_FAN6_PWM_PCT", + "FANBOARD1_FAN7_PWM_PCT", + "FANBOARD1_FAN7_PWM_PCT", + "FANBOARD0_FAN8_PWM_PCT", + "FANBOARD0_FAN8_PWM_PCT", + "FANBOARD0_FAN9_PWM_PCT", + "FANBOARD0_FAN9_PWM_PCT", + "FANBOARD1_FAN10_PWM_PCT", + "FANBOARD1_FAN10_PWM_PCT", + "FANBOARD1_FAN11_PWM_PCT", + "FANBOARD1_FAN11_PWM_PCT" ], "PCoefficient": 0.0, "SlewNeg": 0.0, @@ -484,7 +485,7 @@ "DCoefficient": 0.0, "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -0.035, + "ICoefficient": -0.015, "ILimitMax": 100, "ILimitMin": -50, "Inputs": [ diff --git a/meson.build b/meson.build index 495b4b72..4c764397 100644 --- a/meson.build +++ b/meson.build @@ -34,6 +34,10 @@ if get_option('fru-device') i2c = cpp.find_library('i2c') endif +if get_option('devicetree-vpd') + phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces', include_type: 'system') +endif + nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system') sdbusplus = dependency('sdbusplus', include_type: 'system') phosphor_logging_dep = dependency('phosphor-logging') @@ -154,12 +158,19 @@ configs = [ 'mori_bmc.json', 'mori_motherboard.json', 'mtjade.json', + 'mtjefferson_bmc.json', + 'mtjefferson_mb.json', 'mtmitchell_bmc.json', + 'mtmitchell_bp.json', 'mtmitchell_mb.json', + 'mtmitchell_riser.json', 'mudflap.json', 'nf5280m7_baseboard.json', 'nisqually.json', 'nuvoton_npcm8xx_evb.json', + 'nvidia_gb200_io_board.json', + 'nvidia_gb200.json', + 'nvidia_hmc.json', 'nvme_intel_p_series.json', 'nvme_p4500_p5500.json', 'pcie_ssd_retimer.json', @@ -195,6 +206,11 @@ configs = [ 'vegman_n110_baseboard.json', 'vegman_rx20_baseboard.json', 'vegman_sx20_baseboard.json', + 'ventura_fanboard.json', + 'ventura_ioboard.json', + 'ventura_ledboard.json', + 'ventura_rmc.json', + 'ventura_scm.json', 'wft_baseboard.json', 'yosemite4.json', 'yosemite4_chassis.json', diff --git a/meson_options.txt b/meson_options.txt index ad9f7ed5..d81ab9c0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,11 +2,14 @@ option( 'tests', type: 'feature', description: 'Build tests.', ) option( - 'fru-device', type: 'boolean', description: 'Build fru-device.', + 'fru-device', type: 'boolean', description: 'Build fru-device VPD parser.', ) option( 'fru-device-resizefru', value : false, type: 'boolean', description: 'Allow FruDevice to resize FRU areas.', ) +option( + 'devicetree-vpd', type: 'boolean', description: 'Build device-tree VPD parser' +) option( 'validate-json', type: 'boolean', value: true, description: 'Run JSON schema validation during the build.', ) diff --git a/schemas/global.json b/schemas/global.json index e05f2bf1..e9637746 100644 --- a/schemas/global.json +++ b/schemas/global.json @@ -108,6 +108,9 @@ "xyz.openbmc_project.Inventory.Decorator.Compatible": { "$ref": "openbmc-dbus.json#/$defs/xyz/openbmc_project/Inventory/Decorator/Compatible" }, + "xyz.openbmc_project.Inventory.Decorator.ManagedHost": { + "$ref": "openbmc-dbus.json#/$defs/xyz/openbmc_project/Inventory/Decorator/ManagedHost" + }, "xyz.openbmc_project.Inventory.Decorator.Replaceable": { "$ref": "openbmc-dbus.json#/$defs/xyz/openbmc_project/Inventory/Decorator/Replaceable" }, diff --git a/schemas/legacy.json b/schemas/legacy.json index e56e8e99..6d4fcafc 100644 --- a/schemas/legacy.json +++ b/schemas/legacy.json @@ -449,6 +449,24 @@ "iout3_Name": { "$ref": "#/$defs/Types/iout3_Name" }, + "iout4_Max": { + "$ref": "#/$defs/Types/iout4_Max" + }, + "iout4_Min": { + "$ref": "#/$defs/Types/iout4_Min" + }, + "iout4_Name": { + "$ref": "#/$defs/Types/iout4_Name" + }, + "iout5_Max": { + "$ref": "#/$defs/Types/iout5_Max" + }, + "iout5_Min": { + "$ref": "#/$defs/Types/iout5_Min" + }, + "iout5_Name": { + "$ref": "#/$defs/Types/iout5_Name" + }, "pin1_Max": { "$ref": "#/$defs/Types/pin1_Max" }, @@ -503,18 +521,33 @@ "pout3_Name": { "$ref": "#/$defs/Types/pout3_Name" }, + "power1_Max": { + "$ref": "#/$defs/Types/power1_Max" + }, "power1_Name": { "$ref": "#/$defs/Types/power1_Name" }, + "power2_Max": { + "$ref": "#/$defs/Types/power2_Max" + }, "power2_Name": { "$ref": "#/$defs/Types/power2_Name" }, + "power3_Max": { + "$ref": "#/$defs/Types/power3_Max" + }, "power3_Name": { "$ref": "#/$defs/Types/power3_Name" }, + "power4_Max": { + "$ref": "#/$defs/Types/power4_Max" + }, "power4_Name": { "$ref": "#/$defs/Types/power4_Name" }, + "power5_Max": { + "$ref": "#/$defs/Types/power5_Max" + }, "power5_Name": { "$ref": "#/$defs/Types/power5_Name" }, @@ -530,30 +563,132 @@ "power9_Name": { "$ref": "#/$defs/Types/power9_Name" }, + "temp1_Max": { + "$ref": "#/$defs/Types/temp1_Max" + }, + "temp1_Min": { + "$ref": "#/$defs/Types/temp1_Min" + }, "temp1_Name": { "$ref": "#/$defs/Types/temp1_Name" }, + "temp2_Max": { + "$ref": "#/$defs/Types/temp2_Max" + }, + "temp2_Min": { + "$ref": "#/$defs/Types/temp2_Min" + }, "temp2_Name": { "$ref": "#/$defs/Types/temp2_Name" }, + "temp3_Max": { + "$ref": "#/$defs/Types/temp1_Max" + }, + "temp3_Min": { + "$ref": "#/$defs/Types/temp1_Min" + }, "temp3_Name": { "$ref": "#/$defs/Types/temp3_Name" }, + "temp4_Max": { + "$ref": "#/$defs/Types/temp4_Max" + }, + "temp4_Min": { + "$ref": "#/$defs/Types/temp4_Min" + }, "temp4_Name": { "$ref": "#/$defs/Types/temp4_Name" }, + "temp5_Max": { + "$ref": "#/$defs/Types/temp5_Max" + }, + "temp5_Min": { + "$ref": "#/$defs/Types/temp5_Min" + }, "temp5_Name": { "$ref": "#/$defs/Types/temp5_Name" }, + "temp6_Max": { + "$ref": "#/$defs/Types/temp6_Max" + }, + "temp6_Min": { + "$ref": "#/$defs/Types/temp6_Min" + }, "temp6_Name": { "$ref": "#/$defs/Types/temp6_Name" }, + "temp7_Max": { + "$ref": "#/$defs/Types/temp7_Max" + }, + "temp7_Min": { + "$ref": "#/$defs/Types/temp7_Min" + }, "temp7_Name": { "$ref": "#/$defs/Types/temp7_Name" }, + "temp8_Max": { + "$ref": "#/$defs/Types/temp8_Max" + }, + "temp8_Min": { + "$ref": "#/$defs/Types/temp8_Min" + }, "temp8_Name": { "$ref": "#/$defs/Types/temp8_Name" }, + "temp9_Max": { + "$ref": "#/$defs/Types/temp9_Max" + }, + "temp9_Min": { + "$ref": "#/$defs/Types/temp9_Min" + }, + "temp9_Name": { + "$ref": "#/$defs/Types/temp9_Name" + }, + "temp10_Max": { + "$ref": "#/$defs/Types/temp10_Max" + }, + "temp10_Min": { + "$ref": "#/$defs/Types/temp10_Min" + }, + "temp10_Name": { + "$ref": "#/$defs/Types/temp10_Name" + }, + "temp11_Max": { + "$ref": "#/$defs/Types/temp11_Max" + }, + "temp11_Min": { + "$ref": "#/$defs/Types/temp11_Min" + }, + "temp11_Name": { + "$ref": "#/$defs/Types/temp11_Name" + }, + "temp12_Max": { + "$ref": "#/$defs/Types/temp12_Max" + }, + "temp12_Min": { + "$ref": "#/$defs/Types/temp12_Min" + }, + "temp12_Name": { + "$ref": "#/$defs/Types/temp12_Name" + }, + "temp13_Max": { + "$ref": "#/$defs/Types/temp13_Max" + }, + "temp13_Min": { + "$ref": "#/$defs/Types/temp13_Min" + }, + "temp13_Name": { + "$ref": "#/$defs/Types/temp13_Name" + }, + "vout0_Max": { + "$ref": "#/$defs/Types/vout0_Max" + }, + "vout0_Min": { + "$ref": "#/$defs/Types/vout0_Min" + }, + "vout0_Name": { + "$ref": "#/$defs/Types/vout0_Name" + }, "vout1_Max": { "$ref": "#/$defs/Types/vout1_Max" }, @@ -722,6 +857,18 @@ "iout1_Scale": { "$ref": "#/$defs/Types/iout1_Scale" }, + "iout2_Scale": { + "$ref": "#/$defs/Types/iout2_Scale" + }, + "iout3_Scale": { + "$ref": "#/$defs/Types/iout3_Scale" + }, + "iout4_Scale": { + "$ref": "#/$defs/Types/iout4_Scale" + }, + "iout5_Scale": { + "$ref": "#/$defs/Types/iout5_Scale" + }, "pin_Scale": { "$ref": "#/$defs/Types/pin_Scale" }, @@ -1014,6 +1161,9 @@ }, "Presence": { "properties": { + "MonitorType": { + "enum": ["Event", "Polling"] + }, "PinName": { "type": "string" }, @@ -1310,6 +1460,24 @@ "iout3_Name": { "type": "string" }, + "iout4_Max": { + "type": "number" + }, + "iout4_Min": { + "type": "number" + }, + "iout4_Name": { + "type": "string" + }, + "iout5_Max": { + "type": "number" + }, + "iout5_Min": { + "type": "number" + }, + "iout5_Name": { + "type": "string" + }, "pin1_Max": { "type": "number" }, @@ -1364,18 +1532,33 @@ "pout3_Name": { "type": "string" }, + "power1_Max": { + "type": "number" + }, "power1_Name": { "type": "string" }, + "power2_Max": { + "type": "number" + }, "power2_Name": { "type": "string" }, + "power3_Max": { + "type": "number" + }, "power3_Name": { "type": "string" }, + "power4_Max": { + "type": "number" + }, "power4_Name": { "type": "string" }, + "power5_Max": { + "type": "number" + }, "power5_Name": { "type": "string" }, @@ -1391,30 +1574,132 @@ "power9_Name": { "type": "string" }, + "temp1_Max": { + "type": "number" + }, + "temp1_Min": { + "type": "number" + }, "temp1_Name": { "type": "string" }, + "temp2_Max": { + "type": "number" + }, + "temp2_Min": { + "type": "number" + }, "temp2_Name": { "type": "string" }, + "temp3_Max": { + "type": "number" + }, + "temp3_Min": { + "type": "number" + }, "temp3_Name": { "type": "string" }, + "temp4_Max": { + "type": "number" + }, + "temp4_Min": { + "type": "number" + }, "temp4_Name": { "type": "string" }, + "temp5_Max": { + "type": "number" + }, + "temp5_Min": { + "type": "number" + }, "temp5_Name": { "type": "string" }, + "temp6_Max": { + "type": "number" + }, + "temp6_Min": { + "type": "number" + }, "temp6_Name": { "type": "string" }, + "temp7_Max": { + "type": "number" + }, + "temp7_Min": { + "type": "number" + }, "temp7_Name": { "type": "string" }, + "temp8_Max": { + "type": "number" + }, + "temp8_Min": { + "type": "number" + }, "temp8_Name": { "type": "string" }, + "temp9_Max": { + "type": "number" + }, + "temp9_Min": { + "type": "number" + }, + "temp9_Name": { + "type": "string" + }, + "temp10_Max": { + "type": "number" + }, + "temp10_Min": { + "type": "number" + }, + "temp10_Name": { + "type": "string" + }, + "temp11_Max": { + "type": "number" + }, + "temp11_Min": { + "type": "number" + }, + "temp11_Name": { + "type": "string" + }, + "temp12_Max": { + "type": "number" + }, + "temp12_Min": { + "type": "number" + }, + "temp12_Name": { + "type": "string" + }, + "temp13_Max": { + "type": "number" + }, + "temp13_Min": { + "type": "number" + }, + "temp13_Name": { + "type": "string" + }, + "vout0_Max": { + "type": "number" + }, + "vout0_Min": { + "type": "number" + }, + "vout0_Name": { + "type": "string" + }, "vout1_Max": { "type": "number" }, @@ -1583,6 +1868,18 @@ "iout1_Scale": { "type": "number" }, + "iout2_Scale": { + "type": "number" + }, + "iout3_Scale": { + "type": "number" + }, + "iout4_Scale": { + "type": "number" + }, + "iout5_Scale": { + "type": "number" + }, "pin_Scale": { "type": "number" }, diff --git a/schemas/openbmc-dbus.json b/schemas/openbmc-dbus.json index 75b4d746..24f71b91 100644 --- a/schemas/openbmc-dbus.json +++ b/schemas/openbmc-dbus.json @@ -59,6 +59,16 @@ "required": ["Names"], "type": "object" }, + "ManagedHost": { + "additionalProperties": false, + "properties": { + "HostIndex": { + "type": ["string", "number"] + } + }, + "required": ["HostIndex"], + "type": "object" + }, "Replaceable": { "additionalProperties": false, "properties": { diff --git a/service_files/devicetree-vpd-parser.service b/service_files/devicetree-vpd-parser.service new file mode 100644 index 00000000..4a5ff193 --- /dev/null +++ b/service_files/devicetree-vpd-parser.service @@ -0,0 +1,11 @@ +[Unit] +Description=Makes data from device-tree nodes avaliable thru D-Bus +After=dbus.service + +[Service] +ExecStart=/usr/libexec/entity-manager/devicetree-vpd-parser +Type=dbus +BusName=xyz.openbmc_project.MachineContext + +[Install] +WantedBy=basic.target diff --git a/service_files/meson.build b/service_files/meson.build index 30d8377e..c1454016 100644 --- a/service_files/meson.build +++ b/service_files/meson.build @@ -1,6 +1,7 @@ unit_files = [ ['xyz.openbmc_project.FruDevice.service', 'fru-device'], ['xyz.openbmc_project.EntityManager.service', ''], + ['devicetree-vpd-parser.service', 'devicetree-vpd'], ] foreach u : unit_files diff --git a/src/devicetree_vpd_parser.cpp b/src/devicetree_vpd_parser.cpp new file mode 100644 index 00000000..87bd2d71 --- /dev/null +++ b/src/devicetree_vpd_parser.cpp @@ -0,0 +1,44 @@ +#include "machine_context.hpp" + +#include + +int main() +{ + static constexpr auto reqDBusPath = "/xyz/openbmc_project/MachineContext"; + static constexpr auto reqDBusName = "xyz.openbmc_project.MachineContext"; + + /*Note: OpenBMC convention typically has service name = bus name, + where the bus name is representative of the underlying hardware. + + In the case of MachineContext, the BMC is not gathering data from + specific hardware, but is instead parsing device-tree nodes for + context about the hardware OpenBMC is running on. + + Because the VPD data being parsed is coming from device-tree, + the daemon and matching service name reflect that. + + Because the parsed data represents 'machine context' data, + the bus name and associated path the daemon writes to + reflects that instead. + */ + + sdbusplus::async::context ctx; + sdbusplus::server::manager_t manager{ctx, reqDBusPath}; + + std::unique_ptr mc = nullptr; + if (MachineContext::keyNodeExists()) + { + mc = std::make_unique(ctx, reqDBusPath); + mc->populateFromDeviceTree(); + } + + // NOLINTNEXTLINE(readability-static-accessed-through-instance) + ctx.spawn([](sdbusplus::async::context& ctx) -> sdbusplus::async::task<> { + ctx.request_name(reqDBusName); + co_return; + }(ctx)); + + ctx.run(); + + return 0; +}; diff --git a/src/entity_manager.cpp b/src/entity_manager.cpp index f76a6f5c..96eb384b 100644 --- a/src/entity_manager.cpp +++ b/src/entity_manager.cpp @@ -700,11 +700,6 @@ void postToDbus(const nlohmann::json& newConfiguration, ifacePath += "/"; ifacePath += itemName; - std::shared_ptr itemIface = - createInterface(objServer, ifacePath, - "xyz.openbmc_project.Configuration." + itemType, - boardNameOrig); - if (itemType == "BMC") { std::shared_ptr bmcIface = @@ -726,10 +721,6 @@ void postToDbus(const nlohmann::json& newConfiguration, getPermission(itemType)); } - populateInterfaceFromJson(systemConfiguration, jsonPointerPath, - itemIface, item, objServer, - getPermission(itemType)); - for (const auto& [name, config] : item.items()) { jsonPointerPath = jsonPointerPathBoard; @@ -800,6 +791,15 @@ void postToDbus(const nlohmann::json& newConfiguration, } } + std::shared_ptr itemIface = + createInterface(objServer, ifacePath, + "xyz.openbmc_project.Configuration." + itemType, + boardNameOrig); + + populateInterfaceFromJson(systemConfiguration, jsonPointerPath, + itemIface, item, objServer, + getPermission(itemType)); + topology.addBoard(boardPath, boardType, boardNameOrig, item); } diff --git a/src/machine_context.cpp b/src/machine_context.cpp new file mode 100644 index 00000000..6f2c9563 --- /dev/null +++ b/src/machine_context.cpp @@ -0,0 +1,45 @@ +/* +// Copyright (c) 2024 Hewlett Packard Enterprise +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +*/ + +#include "machine_context.hpp" + +#include +#include + +void MachineContext::populateFromDeviceTree() +{ + std::string nodeVal; + std::ifstream vpdStream(nodeBasePath + std::string("model")); + if (vpdStream && std::getline(vpdStream, nodeVal)) + { + MachineContext::Asset::model(nodeVal); + vpdStream.close(); + } + + vpdStream.open(nodeBasePath + std::string("serial-number")); + if (vpdStream && std::getline(vpdStream, nodeVal)) + { + MachineContext::Asset::serial_number(nodeVal); + vpdStream.close(); + } +}; + +bool MachineContext::keyNodeExists() +{ + std::filesystem::path nodePath{nodeBasePath + std::string("model")}; + + return std::filesystem::exists(nodePath); +}; diff --git a/src/machine_context.hpp b/src/machine_context.hpp new file mode 100644 index 00000000..fca2a336 --- /dev/null +++ b/src/machine_context.hpp @@ -0,0 +1,37 @@ +/* +// Copyright (c) 2024 Hewlett Packard Enterprise +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +*/ + +#pragma once + +#include +#include + +class MachineContext : + public sdbusplus::aserver::xyz::openbmc_project::inventory::decorator:: + Asset +{ + public: + explicit MachineContext(sdbusplus::async::context& ctx, auto path) : + sdbusplus::aserver::xyz::openbmc_project::inventory::decorator::Asset< + MachineContext>(ctx, path) {}; + + void populateFromDeviceTree(); + + static bool keyNodeExists(); + + private: + static constexpr auto nodeBasePath = "/proc/device-tree/"; +}; diff --git a/src/meson.build b/src/meson.build index 6565efc5..00b006f6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -49,3 +49,19 @@ if get_option('fru-device') install_dir: installdir, ) endif + +if get_option('devicetree-vpd') + cpp_args_fd = cpp_args + executable( + 'devicetree-vpd-parser', + 'machine_context.cpp', + 'devicetree_vpd_parser.cpp', + cpp_args: cpp_args_fd, + dependencies: [ + sdbusplus, + phosphor_dbus_interfaces_dep, + ], + install: true, + install_dir: installdir, + ) +endif diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap new file mode 100644 index 00000000..0bf731e9 --- /dev/null +++ b/subprojects/phosphor-dbus-interfaces.wrap @@ -0,0 +1,7 @@ + +[wrap-git] +url = https://github.com/openbmc/phosphor-dbus-interfaces.git +revision = HEAD + +[provide] +phosphor-dbus-interfaces = phosphor_dbus_interfaces_dep