thermal: update thermal config

Based on EVT1.0 thermal results to adjust virtual sensor formula and
WLC charging throttling.
- Virtual-skin version v0.5
- Switch on temp 35C, target temp 39C, spower 2000

Bug: 236562040
Test: ThermalHAL throttling worked properly
Change-Id: I4fb4a5da702a9b904a7377df55f0bb362c74199d

thermal_info_config_charge_lynx.json

@@ -62,13 +62,13 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT",
+            "Name":"VIRTUAL-NEU-QUT-DISP-GNSS-BATT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "quiet_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
-            "Coefficient":[0.1, 0.4, 0.15, 0.1, 0.1, 0.15],
+            "Combination":["neutral_therm", "quiet_therm", "disp_therm", "gnss_tcxo_therm", "battery"],
+            "Coefficient":[0.28, 0.42, 0.1, 0.1, 0.1],
             "Multiplier":0.001
         },
         {
@@ -78,7 +78,7 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
-            "Coefficient":[0.2, 0.26, 0.1, 0.19, 0.25],
+            "Coefficient":[0.27, 0.23, 0.1, 0.27, 0.13],
             "Multiplier":0.001
         },
         {
@@ -108,7 +108,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@@ -152,7 +152,7 @@
             "Formula":"WEIGHTED_AVG",
             "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
             "Coefficient":[0.51, 0.25, 0.24],
-            "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
+            "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -163,7 +163,7 @@
                 "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
                 "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]

thermal_info_config_lynx.json

@@ -62,13 +62,13 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT",
+            "Name":"VIRTUAL-NEU-QUT-DISP-GNSS-BATT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "quiet_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
-            "Coefficient":[0.1, 0.4, 0.15, 0.1, 0.1, 0.15],
+            "Combination":["neutral_therm", "quiet_therm", "disp_therm", "gnss_tcxo_therm", "battery"],
+            "Coefficient":[0.28, 0.42, 0.1, 0.1, 0.1],
             "Multiplier":0.001
         },
         {
@@ -78,7 +78,7 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
-            "Coefficient":[0.2, 0.26, 0.1, 0.19, 0.25],
+            "Coefficient":[0.27, 0.23, 0.1, 0.27, 0.13],
             "Multiplier":0.001
         },
         {
@@ -104,11 +104,11 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.4",
+            "Version":"0.5",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@@ -131,7 +131,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 40.0, 41.0, 47.0, 52.0, 55.0],
             "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
@@ -196,7 +196,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@@ -239,7 +239,7 @@
             "Formula":"WEIGHTED_AVG",
             "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
             "Coefficient":[0.51, 0.25, 0.24],
-            "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
+            "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -250,7 +250,7 @@
                 "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
                 "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
@@ -278,7 +278,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],