configurations: harma: minerva: update configurations

Summary:
1. update harma_mb dimm power threshold.
2. remove harma_mb some unused non-critical threshold.
3. add minerva_pttv adc voltage threshold.
4. remove minerva_pttv PTTV_ADC_P5V_AUX_VOLT_V.

Change-Id: Ic05fe4086a1142fb6ca8020e4d6135d97ec2fe56
Signed-off-by: Daniel Hsu <Daniel-Hsu@quantatw.com>
diff --git a/configurations/harma_mb.json b/configurations/harma_mb.json
index d65a6b8..fe5de73 100644
--- a/configurations/harma_mb.json
+++ b/configurations/harma_mb.json
@@ -742,18 +742,6 @@
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 100.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 105
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
                 }
             ],
             "Type": "PT5161L"
@@ -769,18 +757,6 @@
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 100.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 105
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 5
                 }
             ],
             "Type": "PT5161L"
@@ -819,6 +795,62 @@
                 },
                 {
                     "Direction": "greater than",
+                    "Label": "power2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power3",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power4",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power5",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power6",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power7",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power8",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "power9",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 14.0
+                },
+                {
+                    "Direction": "greater than",
                     "Label": "temp1",
                     "Name": "upper critical",
                     "Severity": 1,
@@ -872,62 +904,6 @@
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 80.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power3",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power4",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power5",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power6",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power7",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power8",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "power9",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 11
                 }
             ],
             "Type": "SBRMI",
diff --git a/configurations/minerva_pttv.json b/configurations/minerva_pttv.json
index 9841966..d8f4602 100644
--- a/configurations/minerva_pttv.json
+++ b/configurations/minerva_pttv.json
@@ -9,7 +9,6 @@
                 "in2",
                 "in3",
                 "in4",
-                "in5",
                 "in6"
             ],
             "Name": "PTTV_ADC",
@@ -110,8 +109,6 @@
             "in3_Scale": 43.233563571,
             "in4_Name": "PTTV_ADC_P48V_VOLT_V",
             "in4_Scale": 41.32231405,
-            "in5_Name": "PTTV_ADC_P5V_AUX_VOLT_V",
-            "in5_Scale": 281.29395218,
             "in6_Name": "PTTV_ADC_P3V3_AUX_VOLT_V",
             "in6_Scale": 500
         },
@@ -127,6 +124,20 @@
             "Thresholds": [
                 {
                     "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 46.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 55.0
+                },
+                {
+                    "Direction": "less than",
                     "Label": "curr1",
                     "Name": "lower critical",
                     "Severity": 1,
@@ -171,6 +182,20 @@
             "Thresholds": [
                 {
                     "Direction": "less than",
+                    "Label": "in1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 46.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Label": "in1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 55.0
+                },
+                {
+                    "Direction": "less than",
                     "Label": "curr1",
                     "Name": "lower critical",
                     "Severity": 1,
@@ -368,7 +393,6 @@
             "Type": "TMP75"
         }
     ],
-    /* Power and thermal test vehicle board */
     "Name": "Minerva PTTV",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva PTTV '})",
     "Type": "Board",