configuration: clemente: add no interposer cable tsense config

- The interposer cable installed for DVT/PVT_S machines are
  known to be incapable of returning correct sensor readings
  and needs to be ignored to prevent false alarm. Adding
  another configuration that removes them.
- Remove the unused "INTERPOSER_CABLE_TSENSE_NEGATIVE_CURR_A".
- Rename sensors to adhere RF naming conventiuons.

Change-Id: I07b685f267a5b7932ba524014d7af2e034cb6e41
Signed-off-by: Bruce Hung <bruce.jy.hung@fii-foxconn.com>
diff --git a/configurations/meta/clemente_interposer.json b/configurations/meta/clemente_interposer.json
index ee697c9..97859b5 100644
--- a/configurations/meta/clemente_interposer.json
+++ b/configurations/meta/clemente_interposer.json
@@ -1,218 +1,390 @@
-{
-    "Exposes": [
-        {
-            "Address": "$address",
-            "Bus": "$bus",
-            "Name": "Clemente Interposer FRU",
-            "Type": "EEPROM"
+[
+    {
+        "Exposes": [
+            {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Clemente Interposer FRU",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x41",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_NIC0",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.2592,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 12.96
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.2112,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.56
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 106
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 105
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_NIC0_CURR_A",
+                "curr1_Offset": -0.0002,
+                "curr1_Scale": 57.957575055,
+                "in1_Name": "INTERPOSER_P12V_NIC0_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_NIC0_PWR_W",
+                "power1_Offset": 0.0022,
+                "power1_Scale": 58031.56917363,
+                "temp1_Name": "INTERPOSER_P12V_NIC0_TEMP_C"
+            },
+            {
+                "Address": "0x42",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_NIC1",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.2592,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 12.96
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.2112,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.56
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 106
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 105
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_NIC1_CURR_A",
+                "curr1_Offset": 0.0004,
+                "curr1_Scale": 54.083288264,
+                "in1_Name": "INTERPOSER_P12V_NIC1_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_NIC1_PWR_W",
+                "power1_Offset": 0.0032,
+                "power1_Scale": 54077.438892494,
+                "temp1_Name": "INTERPOSER_P12V_NIC1_TEMP_C"
+            },
+            {
+                "Address": "0x44",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_SCM",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.272,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 13.6
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.21,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.5
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 126
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 125
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_SCM_CURR_A",
+                "curr1_Offset": 8e-05,
+                "curr1_Scale": 51.030822617,
+                "in1_Name": "INTERPOSER_P12V_SCM_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_SCM_PWR_W",
+                "power1_Offset": -0.0102,
+                "power1_Scale": 50875.050875051,
+                "temp1_Name": "INTERPOSER_P12V_SCM_TEMP_C"
+            }
+        ],
+        "Name": "Clemente Interposer",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Clemente Interposer ', 'BOARD_MANUFACTURER': '(Ingrasys|Quanta)', 'PRODUCT_VERSION': '\\b(DVT|PVT_S)\\b'})",
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
         },
-        {
-            "Address": "0x41",
-            "Bus": 16,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1",
-                "temp1"
-            ],
-            "Name": "Interposer_P12V_NIC0",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.2592,
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.2112,
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 10.56
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 106
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 105
-                }
-            ],
-            "Type": "INA238",
-            "curr1_Name": "interposer_P12V_NIC0_CURR_A",
-            "curr1_Offset": -0.0002,
-            "curr1_Scale": 57.957575055,
-            "in1_Name": "interposer_P12V_NIC0_VOLT_V",
-            "power1_Name": "interposer_P12V_NIC0_PWR_W",
-            "power1_Offset": 0.0022,
-            "power1_Scale": 58031.56917363,
-            "temp1_Name": "interposer_P12V_NIC0_TEMP_C"
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
         },
-        {
-            "Address": "0x42",
-            "Bus": 16,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1",
-                "temp1"
-            ],
-            "Name": "Interposer_P12V_NIC1",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.2592,
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 12.96
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.2112,
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 10.56
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 106
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 105
-                }
-            ],
-            "Type": "INA238",
-            "curr1_Name": "interposer_P12V_NIC1_CURR_A",
-            "curr1_Offset": 0.0004,
-            "curr1_Scale": 54.083288264,
-            "in1_Name": "interposer_P12V_NIC1_VOLT_V",
-            "power1_Name": "interposer_P12V_NIC1_PWR_W",
-            "power1_Offset": 0.0032,
-            "power1_Scale": 54077.438892494,
-            "temp1_Name": "interposer_P12V_NIC1_TEMP_C"
-        },
-        {
-            "Address": "0x44",
-            "Bus": 16,
-            "Labels": [
-                "in1",
-                "curr1",
-                "power1",
-                "temp1"
-            ],
-            "Name": "Interposer_P12V_SCM",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.272,
-                    "Label": "in1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 13.6
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.21,
-                    "Label": "in1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 10.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 126
-                },
-                {
-                    "Direction": "greater than",
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125
-                }
-            ],
-            "Type": "INA238",
-            "curr1_Name": "interposer_P12V_SCM_CURR_A",
-            "curr1_Offset": 8e-05,
-            "curr1_Scale": 51.030822617,
-            "in1_Name": "interposer_P12V_SCM_VOLT_V",
-            "power1_Name": "interposer_P12V_SCM_PWR_W",
-            "power1_Offset": -0.0102,
-            "power1_Scale": 50875.050875051,
-            "temp1_Name": "interposer_P12V_SCM_TEMP_C"
-        },
-        {
-            "Address": "0x44",
-            "Bus": 23,
-            "Labels": [
-                "curr1"
-            ],
-            "Name": "Interposer_CABLE_TSENSE_POSITIVE",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Label": "curr1",
-                    "Name": "upper non recoverable",
-                    "Severity": 4,
-                    "Value": 150
-                }
-            ],
-            "Type": "INA238",
-            "curr1_Max": 0.1,
-            "curr1_Min": 0,
-            "curr1_Name": "interposer_CABLE_TSENSE_POSITIVE_CURR_A",
-            "curr1_Scale": 50000
-        },
-        {
-            "Address": "0x42",
-            "Bus": 23,
-            "Labels": [
-                "curr1"
-            ],
-            "Name": "Interposer_CABLE_TSENSE_NEGATIVE",
-            "Type": "INA238",
-            "curr1_Max": 0.1,
-            "curr1_Min": 0,
-            "curr1_Name": "interposer_CABLE_TSENSE_NEGATIVE_CURR_A",
-            "curr1_Scale": 50000
+        "xyz.openbmc_project.Inventory.Decorator.Revision": {
+            "Version": "$PRODUCT_VERSION"
         }
-    ],
-    "Name": "Clemente Interposer",
-    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Clemente Interposer ', 'BOARD_MANUFACTURER': '(Ingrasys|Quanta)'})",
-    "Type": "Board",
-    "xyz.openbmc_project.Inventory.Decorator.Asset": {
-        "BuildDate": "$BOARD_MANUFACTURE_DATE",
-        "Manufacturer": "$BOARD_MANUFACTURER",
-        "Model": "$BOARD_PRODUCT_NAME",
-        "PartNumber": "$BOARD_PART_NUMBER",
-        "SerialNumber": "$BOARD_SERIAL_NUMBER",
-        "SparePartNumber": "$BOARD_INFO_AM1"
     },
-    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
-        "AssetTag": "$PRODUCT_ASSET_TAG"
-    },
-    "xyz.openbmc_project.Inventory.Decorator.Revision": {
-        "Version": "$PRODUCT_VERSION"
+    {
+        "Exposes": [
+            {
+                "Address": "$address",
+                "Bus": "$bus",
+                "Name": "Clemente Interposer FRU",
+                "Type": "EEPROM"
+            },
+            {
+                "Address": "0x41",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_NIC0",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.2592,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 12.96
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.2112,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.56
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 106
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 105
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_NIC0_CURR_A",
+                "curr1_Offset": -0.0002,
+                "curr1_Scale": 57.957575055,
+                "in1_Name": "INTERPOSER_P12V_NIC0_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_NIC0_PWR_W",
+                "power1_Offset": 0.0022,
+                "power1_Scale": 58031.56917363,
+                "temp1_Name": "INTERPOSER_P12V_NIC0_TEMP_C"
+            },
+            {
+                "Address": "0x42",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_NIC1",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.2592,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 12.96
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.2112,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.56
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 106
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 105
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_NIC1_CURR_A",
+                "curr1_Offset": 0.0004,
+                "curr1_Scale": 54.083288264,
+                "in1_Name": "INTERPOSER_P12V_NIC1_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_NIC1_PWR_W",
+                "power1_Offset": 0.0032,
+                "power1_Scale": 54077.438892494,
+                "temp1_Name": "INTERPOSER_P12V_NIC1_TEMP_C"
+            },
+            {
+                "Address": "0x44",
+                "Bus": 16,
+                "Labels": [
+                    "in1",
+                    "curr1",
+                    "power1",
+                    "temp1"
+                ],
+                "Name": "Interposer_P12V_SCM",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Hysteresis": 0.272,
+                        "Label": "in1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 13.6
+                    },
+                    {
+                        "Direction": "less than",
+                        "Hysteresis": 0.21,
+                        "Label": "in1",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 10.5
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 126
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Label": "temp1",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 125
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Name": "INTERPOSER_P12V_SCM_CURR_A",
+                "curr1_Offset": 8e-05,
+                "curr1_Scale": 51.030822617,
+                "in1_Name": "INTERPOSER_P12V_SCM_VOLT_V",
+                "power1_Name": "INTERPOSER_P12V_SCM_PWR_W",
+                "power1_Offset": -0.0102,
+                "power1_Scale": 50875.050875051,
+                "temp1_Name": "INTERPOSER_P12V_SCM_TEMP_C"
+            },
+            {
+                "Address": "0x44",
+                "Bus": 23,
+                "Labels": [
+                    "curr1"
+                ],
+                "Name": "Interposer_CABLE_TSENSE_POSITIVE",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Label": "curr1",
+                        "Name": "upper non recoverable",
+                        "Severity": 4,
+                        "Value": 150
+                    }
+                ],
+                "Type": "INA238",
+                "curr1_Max": 0.1,
+                "curr1_Min": 0,
+                "curr1_Name": "INTERPOSER_CABLE_TSENSE_POSITIVE_CURR_A",
+                "curr1_Scale": 50000
+            }
+        ],
+        "Name": "Clemente Interposer",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Clemente Interposer ', 'BOARD_MANUFACTURER': '(Ingrasys|Quanta)', 'PRODUCT_VERSION': '\\b(PVT2|MP)\\b'})",
+        "Type": "Board",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER",
+            "SparePartNumber": "$BOARD_INFO_AM1"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.Revision": {
+            "Version": "$PRODUCT_VERSION"
+        }
     }
-}
+]