configurations: yosemite4: Adjust PWR sq52205

Description
Adjust the settings of the PWR sq52205 sensor and move the threshold
 to the virtual sensor.

Motivation
When binding drivers using the entity-manager, the specific driver
 properties originally set in the DTS need to be replaced with the
 Scale property in the entity-manager to properly adjust the sensor
 readings.

Test Plan:
Confirmed by EE that the hardware values are consistent with the
 software values.

Change-Id: I6cdcd11306d6d29e479bc2b3631af9ac6083ea4a
Signed-off-by: Andy Hsu <andy.hsu.wiwynn@gmail.com>
diff --git a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_silergy.json b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_silergy.json
index 032ccef..cd48838 100644
--- a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_silergy.json
+++ b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_silergy.json
@@ -534,7 +534,7 @@
             "Address": "0x40",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -591,7 +591,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -599,7 +599,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -607,7 +607,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -615,7 +615,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -623,7 +623,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -631,7 +631,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -639,14 +639,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_12V_STBY_CURR_A",
-            "in0_Name": "SPIDER_PMON_12V_STBY_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_12V_STBY_VOLT_V",
             "power1_Name": "SPIDER_PMON_12V_STBY_PWR_W"
         },
         {
             "Address": "0x41",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -655,30 +656,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -703,7 +680,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -711,7 +688,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -719,7 +696,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -727,7 +704,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -735,7 +712,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -743,7 +720,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -751,14 +728,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC0_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC0_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC0_12V_PWR_W"
         },
         {
             "Address": "0x42",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -767,30 +745,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -815,7 +769,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -823,7 +777,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -831,7 +785,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -839,7 +793,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -847,7 +801,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -855,7 +809,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -863,14 +817,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC1_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC1_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC1_12V_PWR_W"
         },
         {
             "Address": "0x43",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -879,30 +834,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -927,7 +858,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -935,7 +866,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -943,7 +874,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -951,7 +882,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -959,7 +890,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -967,7 +898,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -975,14 +906,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC2_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC2_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC2_12V_PWR_W"
         },
         {
             "Address": "0x44",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -991,30 +923,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -1039,7 +947,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -1047,7 +955,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -1055,7 +963,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -1063,7 +971,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -1071,7 +979,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -1079,7 +987,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -1087,7 +995,8 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC3_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC3_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC3_12V_PWR_W"
         },
         {
diff --git a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_silergy.json b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_silergy.json
index 9239849..cfb5d03 100644
--- a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_silergy.json
+++ b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_silergy.json
@@ -544,7 +544,7 @@
             "Address": "0x40",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -601,7 +601,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -609,7 +609,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -617,7 +617,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -625,7 +625,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -633,7 +633,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -641,7 +641,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -649,14 +649,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_12V_STBY_CURR_A",
-            "in0_Name": "SPIDER_PMON_12V_STBY_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_12V_STBY_VOLT_V",
             "power1_Name": "SPIDER_PMON_12V_STBY_PWR_W"
         },
         {
             "Address": "0x41",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -665,30 +666,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -713,7 +690,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -721,7 +698,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -729,7 +706,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -737,7 +714,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -745,7 +722,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -753,7 +730,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -761,14 +738,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC0_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC0_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC0_12V_PWR_W"
         },
         {
             "Address": "0x42",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -777,30 +755,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -825,7 +779,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -833,7 +787,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -841,7 +795,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -849,7 +803,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -857,7 +811,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -865,7 +819,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -873,14 +827,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC1_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC1_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC1_12V_PWR_W"
         },
         {
             "Address": "0x43",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -889,30 +844,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -937,7 +868,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -945,7 +876,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -953,7 +884,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -961,7 +892,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -969,7 +900,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -977,7 +908,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -985,14 +916,15 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC2_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC2_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC2_12V_PWR_W"
         },
         {
             "Address": "0x44",
             "Bus": 14,
             "Labels": [
-                "in0",
+                "in1",
                 "curr1",
                 "power1"
             ],
@@ -1001,30 +933,6 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 5.4
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 4.51
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
-                    "Label": "curr1",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 4.305
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0,
                     "Label": "power1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
@@ -1049,7 +957,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non recoverable",
                     "Severity": 4,
                     "Value": 14.333
@@ -1057,7 +965,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 13.176
@@ -1065,7 +973,7 @@
                 {
                     "Direction": "greater than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "upper non critical",
                     "Severity": 0,
                     "Value": 13.054
@@ -1073,7 +981,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non critical",
                     "Severity": 0,
                     "Value": 11.346
@@ -1081,7 +989,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 11.224
@@ -1089,7 +997,7 @@
                 {
                     "Direction": "less than",
                     "Hysteresis": 0,
-                    "Label": "in0",
+                    "Label": "in1",
                     "Name": "lower non recoverable",
                     "Severity": 4,
                     "Value": 10.091
@@ -1097,7 +1005,8 @@
             ],
             "Type": "SY24655",
             "curr1_Name": "SPIDER_PMON_NIC3_12V_CURR_A",
-            "in0_Name": "SPIDER_PMON_NIC3_12V_VOLT_V",
+            "curr1_Scale": 500,
+            "in1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V",
             "power1_Name": "SPIDER_PMON_NIC3_12V_PWR_W"
         },
         {