configurations: ventura: modify sensor name and formula
1. Modify 2nd RMC and Fan sensor name and threshold label name.
2. Modify 2nd Fan sensor formula.
Change-Id: I673262c38d27978ea2685eee2a4a068b8b3865b2
Signed-off-by: Jason Hsu <jason-hsu@quantatw.com>
diff --git a/configurations/meta/ventura_fanboard_adc_max.json b/configurations/meta/ventura_fanboard_adc_max.json
index 2d5cf4d..5454a52 100644
--- a/configurations/meta/ventura_fanboard_adc_max.json
+++ b/configurations/meta/ventura_fanboard_adc_max.json
@@ -15,7 +15,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in0",
+ "Label": "in_voltage0",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -23,7 +23,7 @@
{
"Direction": "less than",
"Hysteresis": 2.1,
- "Label": "in0",
+ "Label": "in_voltage0",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
@@ -31,7 +31,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in2",
+ "Label": "in_voltage2",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -39,7 +39,7 @@
{
"Direction": "less than",
"Hysteresis": 2.1,
- "Label": "in2",
+ "Label": "in_voltage2",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
@@ -48,14 +48,14 @@
"Type": "MAX11617",
"in_voltage0_Max": 18,
"in_voltage0_Name": "FCB_0_FAN_0_VOLT_V",
- "in_voltage0_Scale": 133.262,
- "in_voltage1_Name": "FCB_0_FAN_0_CURR_A",
- "in_voltage1_Scale": 464,
+ "in_voltage0_Scale": 266.525,
+ "in_voltage1_Name": "FCB_0_FAN_0_IMON_VOLT_V",
+ "in_voltage1_Scale": 2,
"in_voltage2_Max": 18,
"in_voltage2_Name": "FCB_0_FAN_1_VOLT_V",
- "in_voltage2_Scale": 133.262,
- "in_voltage3_Name": "FCB_0_FAN_1_CURR_A",
- "in_voltage3_Scale": 464
+ "in_voltage2_Scale": 266.525,
+ "in_voltage3_Name": "FCB_0_FAN_1_IMON_VOLT_V",
+ "in_voltage3_Scale": 2
}
],
"Name": "Ventura Fan Board 0",
@@ -92,7 +92,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in0",
+ "Label": "in_voltage0",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -100,7 +100,7 @@
{
"Direction": "less than",
"Hysteresis": 2.1,
- "Label": "in0",
+ "Label": "in_voltage0",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
@@ -108,7 +108,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in2",
+ "Label": "in_voltage2",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -116,7 +116,7 @@
{
"Direction": "less than",
"Hysteresis": 2.1,
- "Label": "in2",
+ "Label": "in_voltage2",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
@@ -125,14 +125,14 @@
"Type": "MAX11617",
"in_voltage0_Max": 18,
"in_voltage0_Name": "FCB_1_FAN_2_VOLT_V",
- "in_voltage0_Scale": 133.262,
- "in_voltage1_Name": "FCB_1_FAN_2_CURR_A",
- "in_voltage1_Scale": 464,
+ "in_voltage0_Scale": 266.525,
+ "in_voltage1_Name": "FCB_1_FAN_2_IMON_VOLT_V",
+ "in_voltage1_Scale": 2,
"in_voltage2_Max": 18,
"in_voltage2_Name": "FCB_1_FAN_3_VOLT_V",
- "in_voltage2_Scale": 133.262,
- "in_voltage3_Name": "FCB_1_FAN_3_CURR_A",
- "in_voltage3_Scale": 464
+ "in_voltage2_Scale": 266.525,
+ "in_voltage3_Name": "FCB_1_FAN_3_IMON_VOLT_V",
+ "in_voltage3_Scale": 2
}
],
"Name": "Ventura Fan Board 1",
diff --git a/configurations/meta/ventura_fanboard_adc_tic.json b/configurations/meta/ventura_fanboard_adc_tic.json
index e80b0e5..ee39068 100644
--- a/configurations/meta/ventura_fanboard_adc_tic.json
+++ b/configurations/meta/ventura_fanboard_adc_tic.json
@@ -49,13 +49,13 @@
"in0_Max": 18,
"in0_Name": "FCB_0_FAN_0_VOLT_V",
"in0_Scale": 133.262,
- "in1_Name": "FCB_0_FAN_0_CURR_A",
- "in1_Scale": 464,
+ "in1_Name": "FCB_0_FAN_0_IMON_VOLT_V",
+ "in1_Scale": 1,
"in2_Max": 18,
"in2_Name": "FCB_0_FAN_1_VOLT_V",
"in2_Scale": 133.262,
- "in3_Name": "FCB_0_FAN_1_CURR_A",
- "in3_Scale": 464
+ "in3_Name": "FCB_0_FAN_1_IMON_VOLT_V",
+ "in3_Scale": 1
}
],
"Name": "Ventura Fan Board 0",
@@ -126,13 +126,13 @@
"in0_Max": 18,
"in0_Name": "FCB_1_FAN_2_VOLT_V",
"in0_Scale": 133.262,
- "in1_Name": "FCB_1_FAN_2_CURR_A",
- "in1_Scale": 464,
+ "in1_Name": "FCB_1_FAN_2_IMON_VOLT_V",
+ "in1_Scale": 1,
"in2_Max": 18,
"in2_Name": "FCB_1_FAN_3_VOLT_V",
"in2_Scale": 133.262,
- "in3_Name": "FCB_1_FAN_3_CURR_A",
- "in3_Scale": 464
+ "in3_Name": "FCB_1_FAN_3_IMON_VOLT_V",
+ "in3_Scale": 1
}
],
"Name": "Ventura Fan Board 1",
diff --git a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
index a85b376..cb78b0f 100644
--- a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
+++ b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
@@ -269,7 +269,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.504,
- "Label": "in1",
+ "Label": "in0",
"Name": "upper critical",
"Severity": 1,
"Value": 25.2
@@ -277,7 +277,7 @@
{
"Direction": "less than",
"Hysteresis": 0.456,
- "Label": "in1",
+ "Label": "in0",
"Name": "lower critical",
"Severity": 1,
"Value": 22.8
@@ -295,8 +295,8 @@
"curr1_Name": "RMC_M12_P24V_CURR_A",
"curr1_Offset": 0.0015,
"curr1_Scale": 103.8152089281,
- "in1_Max": 36,
- "in1_Name": "RMC_M12_P24V_VOLT_V",
+ "in0_Max": 36,
+ "in0_Name": "RMC_M12_P24V_VOLT_V",
"power1_Name": "RMC_M12_P24V_PWR_W",
"power1_Offset": 0.0015,
"power1_Scale": 105944.829230178
@@ -314,7 +314,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.504,
- "Label": "in1",
+ "Label": "in0",
"Name": "upper critical",
"Severity": 1,
"Value": 25.2
@@ -322,7 +322,7 @@
{
"Direction": "less than",
"Hysteresis": 0.456,
- "Label": "in1",
+ "Label": "in0",
"Name": "lower critical",
"Severity": 1,
"Value": 22.8
@@ -340,8 +340,8 @@
"curr1_Name": "RMC_RJ14_P24V_CURR_A",
"curr1_Offset": -0.0003,
"curr1_Scale": 104.4004802422,
- "in1_Max": 36,
- "in1_Name": "RMC_RJ14_P24V_VOLT_V",
+ "in0_Max": 36,
+ "in0_Name": "RMC_RJ14_P24V_VOLT_V",
"power1_Name": "RMC_RJ14_P24V_PWR_W",
"power1_Offset": -0.0161,
"power1_Scale": 106195.160155576
@@ -357,7 +357,7 @@
{
"Direction": "greater than",
"Hysteresis": 4.0,
- "Label": "in0",
+ "Label": "in1",
"Name": "upper critical",
"Severity": 1,
"Value": 200
@@ -380,7 +380,7 @@
{
"Direction": "greater than",
"Hysteresis": 4.0,
- "Label": "in0",
+ "Label": "in1",
"Name": "upper critical",
"Severity": 1,
"Value": 200