configurations: yosemite4: Revise the descriptor part of sensor name
Revise the descriptor part of sensor name to comply naming rule.
Change-Id: I8715e49ef19270089728936a16667163ed522f99
Signed-off-by: Lora Lin <lora.lin.wiwynn@gmail.com>
diff --git a/configurations/yosemite4.json b/configurations/yosemite4.json
index a0e8d2a..bad6734 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": [
@@ -443,59 +443,59 @@
"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,
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 682d7e9..1f85c97 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": [
{
@@ -296,15 +296,15 @@
"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": [
{
@@ -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,15 +368,15 @@
"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": [
{
@@ -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,15 +440,15 @@
"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": [
{
@@ -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,15 +512,15 @@
"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": [
{
@@ -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,15 +584,15 @@
"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": [
{
@@ -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,15 +656,15 @@
"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": [
{
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 d46ff99..44b6b54 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": [
{
@@ -296,15 +296,15 @@
"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": [
{
@@ -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,15 +368,15 @@
"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": [
{
@@ -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,15 +440,15 @@
"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": [
{
@@ -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,15 +512,15 @@
"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": [
{
@@ -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,15 +584,15 @@
"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": [
{
@@ -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,15 +656,15 @@
"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": [
{
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 53b8173..33b1591 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": [
{
@@ -46,15 +46,15 @@
"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": [
{
@@ -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": [
{
@@ -118,15 +118,15 @@
"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": [
{
@@ -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": [
{
@@ -190,15 +190,15 @@
"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": [
{
@@ -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": [
{
@@ -262,15 +262,15 @@
"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": [
{
@@ -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": [
{
@@ -334,15 +334,15 @@
"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": [
{
@@ -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": [
{
@@ -406,15 +406,15 @@
"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": [
{
@@ -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 7554571..10712b2 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": [
{
@@ -46,15 +46,15 @@
"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": [
{
@@ -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": [
{
@@ -118,15 +118,15 @@
"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": [
{
@@ -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": [
{
@@ -190,15 +190,15 @@
"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": [
{
@@ -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": [
{
@@ -262,15 +262,15 @@
"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": [
{
@@ -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": [
{
@@ -334,15 +334,15 @@
"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": [
{
@@ -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": [
{
@@ -406,15 +406,15 @@
"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": [
{
@@ -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 63539cd..97fc6f5 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json
@@ -10,7 +10,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -107,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",
@@ -125,7 +125,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -222,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",
@@ -240,7 +240,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -337,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",
@@ -355,7 +355,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -452,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",
@@ -470,7 +470,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -567,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",
@@ -585,7 +585,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -682,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",
@@ -700,7 +700,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -797,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",
@@ -815,7 +815,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -912,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",
@@ -963,7 +963,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1100,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,
@@ -1116,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,
@@ -1148,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,
@@ -1171,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,
@@ -1197,10 +1197,10 @@
{
"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": 2,
@@ -1229,7 +1229,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1243,7 +1243,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1264,7 +1264,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC0",
+ "Name": "MEDUSA_HSC0_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1359,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",
@@ -1377,7 +1377,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1472,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",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 6c463c7..9fec618 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",
@@ -105,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",
@@ -123,7 +123,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -218,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",
@@ -269,7 +269,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -406,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",
@@ -422,7 +422,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -519,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",
@@ -537,7 +537,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -634,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",
@@ -652,7 +652,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -749,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",
@@ -767,7 +767,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -864,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",
@@ -882,7 +882,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -979,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",
@@ -997,7 +997,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -1094,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",
@@ -1112,7 +1112,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -1209,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",
@@ -1227,7 +1227,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1324,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,
@@ -1342,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,
@@ -1374,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,
@@ -1397,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,
@@ -1423,10 +1423,10 @@
{
"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": 2,
@@ -1455,7 +1455,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1469,7 +1469,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 0f84f1e..788ac34 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,7 +196,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -293,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",
@@ -311,7 +311,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -408,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",
@@ -426,7 +426,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -523,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",
@@ -541,7 +541,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -638,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",
@@ -656,7 +656,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -753,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",
@@ -771,7 +771,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -868,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",
@@ -886,7 +886,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -983,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",
@@ -1001,7 +1001,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1098,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,
@@ -1116,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,
@@ -1148,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,
@@ -1171,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,
@@ -1197,10 +1197,10 @@
{
"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": 2,
@@ -1229,7 +1229,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1243,7 +1243,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1264,7 +1264,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC0",
+ "Name": "MEDUSA_HSC0_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1359,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",
@@ -1377,7 +1377,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1472,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",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 c884f57..267561c 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",
@@ -105,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",
@@ -123,7 +123,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -218,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",
@@ -236,7 +236,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -333,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",
@@ -351,7 +351,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -448,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",
@@ -466,7 +466,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -563,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",
@@ -581,7 +581,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -678,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",
@@ -696,7 +696,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -793,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",
@@ -811,7 +811,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -908,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",
@@ -926,7 +926,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -1023,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",
@@ -1041,7 +1041,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1138,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",
@@ -1189,7 +1189,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1326,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,
@@ -1342,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,
@@ -1374,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,
@@ -1397,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,
@@ -1423,10 +1423,10 @@
{
"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": 2,
@@ -1455,7 +1455,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1469,7 +1469,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 9a760f4..e8fb6fc 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,7 +217,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -312,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",
@@ -330,7 +330,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -425,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",
@@ -443,7 +443,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -538,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",
@@ -556,7 +556,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -651,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",
@@ -669,7 +669,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -764,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",
@@ -782,7 +782,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -877,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",
@@ -895,7 +895,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -990,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",
@@ -1008,7 +1008,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1103,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,
@@ -1121,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,
@@ -1153,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"
],
@@ -1183,10 +1183,10 @@
{
"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": 2,
@@ -1215,7 +1215,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1229,7 +1229,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1250,7 +1250,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC0",
+ "Name": "MEDUSA_HSC0_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1345,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",
@@ -1363,7 +1363,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1458,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",
@@ -1475,7 +1475,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1591,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",
@@ -1605,7 +1605,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1721,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",
@@ -1735,7 +1735,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1851,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",
@@ -1865,7 +1865,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1981,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 282ae90..92ae8a2 100644
--- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json
@@ -10,7 +10,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -107,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",
@@ -125,7 +125,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -222,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",
@@ -240,7 +240,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -337,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",
@@ -355,7 +355,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -452,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",
@@ -470,7 +470,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -567,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",
@@ -585,7 +585,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -682,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",
@@ -700,7 +700,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -797,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",
@@ -815,7 +815,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -912,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",
@@ -973,7 +973,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1110,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,
@@ -1126,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,
@@ -1148,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,
@@ -1171,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,
@@ -1197,10 +1197,10 @@
{
"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": 2,
@@ -1229,7 +1229,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1243,7 +1243,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1264,7 +1264,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC0",
+ "Name": "MEDUSA_HSC0_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1359,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",
@@ -1377,7 +1377,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1472,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",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 b9d8495..423464c 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",
@@ -105,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",
@@ -123,7 +123,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -218,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",
@@ -279,7 +279,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -416,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",
@@ -432,7 +432,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -529,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",
@@ -547,7 +547,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -644,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",
@@ -662,7 +662,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -759,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",
@@ -777,7 +777,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -874,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",
@@ -892,7 +892,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -989,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",
@@ -1007,7 +1007,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -1104,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",
@@ -1122,7 +1122,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -1219,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",
@@ -1237,7 +1237,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1334,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,
@@ -1352,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,
@@ -1374,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,
@@ -1397,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,
@@ -1423,10 +1423,10 @@
{
"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": 2,
@@ -1455,7 +1455,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1469,7 +1469,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 d99f822..6b4f337 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,7 +206,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -303,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",
@@ -321,7 +321,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -418,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",
@@ -436,7 +436,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -533,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",
@@ -551,7 +551,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -648,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",
@@ -666,7 +666,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -763,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",
@@ -781,7 +781,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -878,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",
@@ -896,7 +896,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -993,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",
@@ -1011,7 +1011,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1108,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,
@@ -1126,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,
@@ -1148,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,
@@ -1171,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,
@@ -1197,10 +1197,10 @@
{
"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": 2,
@@ -1229,7 +1229,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1243,7 +1243,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1264,7 +1264,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC0",
+ "Name": "MEDUSA_HSC0_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1359,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",
@@ -1377,7 +1377,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1472,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",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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 090cf08..2c26d0f 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",
@@ -105,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",
@@ -123,7 +123,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_48VHSC1",
+ "Name": "MEDUSA_HSC1_48V",
"Thresholds": [
{
"Direction": "greater than",
@@ -218,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",
@@ -236,7 +236,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB1_12VHSC",
+ "Name": "MEDUSA_MB1_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "1",
"Thresholds": [
@@ -333,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",
@@ -351,7 +351,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB2_12VHSC",
+ "Name": "MEDUSA_MB2_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "2",
"Thresholds": [
@@ -448,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",
@@ -466,7 +466,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB3_12VHSC",
+ "Name": "MEDUSA_MB3_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "3",
"Thresholds": [
@@ -563,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",
@@ -581,7 +581,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB4_12VHSC",
+ "Name": "MEDUSA_MB4_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "4",
"Thresholds": [
@@ -678,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",
@@ -696,7 +696,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB5_12VHSC",
+ "Name": "MEDUSA_MB5_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "5",
"Thresholds": [
@@ -793,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",
@@ -811,7 +811,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB6_12VHSC",
+ "Name": "MEDUSA_MB6_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "6",
"Thresholds": [
@@ -908,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",
@@ -926,7 +926,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB7_12VHSC",
+ "Name": "MEDUSA_MB7_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "7",
"Thresholds": [
@@ -1023,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",
@@ -1041,7 +1041,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_MB8_12VHSC",
+ "Name": "MEDUSA_MB8_HSC_12V",
"PowerState": "ChassisOn",
"SlotId": "8",
"Thresholds": [
@@ -1138,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",
@@ -1199,7 +1199,7 @@
"iout1",
"pin"
],
- "Name": "MEDUSA_12VEFFUSE",
+ "Name": "MEDUSA_EFFUSE_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1336,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,
@@ -1352,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,
@@ -1374,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,
@@ -1397,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,
@@ -1423,10 +1423,10 @@
{
"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": 2,
@@ -1455,7 +1455,7 @@
{
"Address": "0x48",
"Bus": 11,
- "Name": "MEDUSA_0_TEMP_C",
+ "Name": "MEDUSA0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1469,7 +1469,7 @@
{
"Address": "0x49",
"Bus": 11,
- "Name": "MEDUSA_1_TEMP_C",
+ "Name": "MEDUSA1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1489,7 +1489,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA0",
+ "Name": "MEDUSA_DELTA0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1605,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",
@@ -1619,7 +1619,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA1",
+ "Name": "MEDUSA_DELTA1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1735,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",
@@ -1749,7 +1749,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA2",
+ "Name": "MEDUSA_DELTA2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1865,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",
@@ -1879,7 +1879,7 @@
"vout1",
"iout1"
],
- "Name": "MEDUSA_12VDELTA3",
+ "Name": "MEDUSA_DELTA3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -1995,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_t1_retimer.json b/configurations/yosemite4_sentineldome_t1_retimer.json
index ff436d4..20f1a2e 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,
@@ -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,
diff --git a/configurations/yosemite4_sentineldome_t2_retimer.json b/configurations/yosemite4_sentineldome_t2_retimer.json
index 7a3d54e..ad07c4e 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,
@@ -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,
diff --git a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
index cc3a73b..32f1a4d 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,7 +993,7 @@
{
"Address": "0x4e",
"Bus": 14,
- "Name": "SPIDER_0_TEMP_C",
+ "Name": "SPIDER0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1013,7 +1013,7 @@
{
"Address": "0x4f",
"Bus": 14,
- "Name": "SPIDER_1_TEMP_C",
+ "Name": "SPIDER1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
diff --git a/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json
index 426baff..e45ff28 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,7 +1003,7 @@
{
"Address": "0x4e",
"Bus": 14,
- "Name": "SPIDER_0_TEMP_C",
+ "Name": "SPIDER0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1023,7 +1023,7 @@
{
"Address": "0x4f",
"Bus": 14,
- "Name": "SPIDER_1_TEMP_C",
+ "Name": "SPIDER1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
diff --git a/configurations/yosemite4_wailuafalls.json b/configurations/yosemite4_wailuafalls.json
index b345e29..6790d8b 100644
--- a/configurations/yosemite4_wailuafalls.json
+++ b/configurations/yosemite4_wailuafalls.json
@@ -11,14 +11,14 @@
"ILimitMin": -50,
"InputUnavailableAsFailed": false,
"Inputs": [
- "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"
+ "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,
@@ -127,14 +127,14 @@
"Class": "temp",
"InputUnavailableAsFailed": false,
"Inputs": [
- "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"
+ "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,
diff --git a/configurations/yosemite4n.json b/configurations/yosemite4n.json
index 9e63bb1..073bd29 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,7 +168,7 @@
},
{
"Index": 4,
- "Name": "MGNT_P5V_USB_VOLT_V",
+ "Name": "MGNT_ADC_P5V_USB_VOLT_V",
"ScaleFactor": 0.2717,
"Thresholds": [
{
@@ -212,7 +212,7 @@
},
{
"Index": 5,
- "Name": "MGNT_P1V2_VOLT_V",
+ "Name": "MGNT_ADC_P1V2_VOLT_V",
"ScaleFactor": 1,
"Thresholds": [
{
@@ -263,7 +263,7 @@
}
],
"Index": 6,
- "Name": "MGNT_P3V_BAT_VOLT_V",
+ "Name": "MGNT_ADC_P3V_BAT_VOLT_V",
"PollRate": 3600,
"ScaleFactor": 0.3333,
"Thresholds": [
@@ -296,7 +296,7 @@
},
{
"Index": 7,
- "Name": "MGNT_P1V07_BMC_VOLT_V",
+ "Name": "MGNT_ADC_P1V07_BMC_VOLT_V",
"ScaleFactor": 1,
"Thresholds": [
{
@@ -364,7 +364,7 @@
}
],
"Type": "ADC128D818",
- "in0_Name": "MGNT_P1V8_VOLT_V",
+ "in0_Name": "MGNT_ADC_P1V8_VOLT_V",
"in0_Scale": 824.561
},
{
@@ -405,7 +405,7 @@
}
],
"Type": "MAX11615",
- "in_voltage0_Name": "MGNT_P1V8_VOLT_V",
+ "in_voltage0_Name": "MGNT_ADC_P1V8_VOLT_V",
"in_voltage0_Scale": 1649.122
},
{
@@ -417,59 +417,59 @@
"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,