From ae378716d327e6459a2894d9af82431aed5192c0 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 18:48:57 +0000
Subject: [PATCH 1/4] Remove settings for old ArmNN HIDL backend

Compile ArmNN shim over the support library.

Remove SELinux permissions and settings for the old HIDL backend.
The AIDL settings will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: Ie9862ad196383126fa4f1a684bc2f5326d8fb15c
---
 manifest.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 75aa800..e01d156 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -98,16 +98,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>armnn</instance>
-        </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
-    </hal>
     <hal format="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>

From 811fcabbc08357d9f8759f5e418a087385e93daa Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Fri, 14 Jul 2023 11:16:24 -0700
Subject: [PATCH 2/4] thermal: update VSKIN equation for DVT

Bug: 291150669
Test: boot to home
Change-Id: Iaf3a109505e5c2632b855f1f75f36fd74be8dcc3
---
 thermal/thermal_info_config_charge_husky.json |  47 +++--
 thermal/thermal_info_config_charge_shiba.json |  67 +++++--
 thermal/thermal_info_config_husky.json        | 170 ++++++++++--------
 thermal/thermal_info_config_shiba.json        | 141 ++++++++++-----
 4 files changed, 271 insertions(+), 154 deletions(-)

diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json
index 268c8de..59fa1f8 100644
--- a/thermal/thermal_info_config_charge_husky.json
+++ b/thermal/thermal_info_config_charge_husky.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 32.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"cam_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 33.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.8, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charge_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 52.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 33.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,13 +59,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 35.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -88,8 +92,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.05, 0.02, 0.01, 0, 0.49, 0.04, 0.12, 0.07, 0.12],
-            "Offset":760,
+            "Coefficient":[0.04, 0.16, 0.19, 0.16, 0.17, 0, 0.01, 0.24, 0],
+            "Offset":-820,
             "Multiplier":0.001
         },
         {
@@ -99,8 +103,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0],
-            "Offset":3000,
+            "Coefficient":[0.02, 0.01, 0.04, 0.04, 0.4, 0.14, 0.1, 0.02, 0.12],
+            "Offset":1840,
             "Multiplier":0.001
         },
         {
@@ -110,19 +114,30 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.09, 0.19, 0.08, 0.17, 0.36, 0.04, 0, 0, 0],
-            "Offset":1290,
+            "Coefficient":[0.18, 0.1, 0.15, 0.13, 0.22, 0.16, 0.02, 0.04, 0.01],
+            "Offset":-2810,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-3",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0],
+            "Offset":1140,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"3.0",
+            "Version":"4.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
-            "Coefficient":[1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json
index 9aa226d..f73e8f2 100644
--- a/thermal/thermal_info_config_charge_shiba.json
+++ b/thermal/thermal_info_config_charge_shiba.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 29.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 38.8, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"cam_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 34.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charge_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 49.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 42.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 28.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 35.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -92,8 +92,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07],
-            "Offset":2780,
+            "Coefficient":[0.28, 0.14, 0.17, 0.13, 0.02, 0.19, 0, 0, 0],
+            "Offset":1280,
             "Multiplier":0.001
         },
         {
@@ -103,8 +103,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.08, 0.01, 0.03, 0.21, 0.2, 0.22, 0.13, 0],
-            "Offset":3910,
+            "Coefficient":[0.07, 0.05, 0.18, 0.19, 0.43, 0, 0.1, 0, 0],
+            "Offset":-3320,
             "Multiplier":0.001
         },
         {
@@ -114,8 +114,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0],
-            "Offset":1360,
+            "Coefficient":[0, 0, 0, 0.21, 0.17, 0.20, 0.07, 0.04, 0.18],
+            "Offset":2960,
             "Multiplier":0.001
         },
         {
@@ -125,19 +125,52 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.16, 0.03, 0.32, 0.16, 0, 0.11, 0.13, 0, 0],
-            "Offset":1190,
+            "Coefficient":[0.06, 0.06, 0.05, 0, 0.17, 0.13, 0, 0.4, 0.09],
+            "Offset":1010,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-4",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.06, 0.14, 0.01, 0.16, 0.09, 0.31, 0.01, 0.13, 0.02],
+            "Offset":1750,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-5",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0, 0.14, 0.31, 0.11, 0.06, 0.13, 0.16, 0, 0],
+            "Offset":1500,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-6",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.01, 0.02, 0.33, 0.09, 0.62, 0, 0, 0, 0],
+            "Offset":-5080,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"3.0",
+            "Version":"4.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index d27c76a..fc4817f 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 32.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"cam_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 33.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 45.8, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charge_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 52.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 33.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -59,13 +59,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 35.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -191,8 +195,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.33, 0.02, 0.50, 0, 0, 0, 0.06, 0, 0],
-            "Offset":-1530,
+            "Coefficient":[0, 0.27, 0.17, 0.11, 0, 0.2, 0.01, 0.06, 0.08],
+            "Offset":2110,
             "Multiplier":0.001
         },
         {
@@ -202,8 +206,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.05, 0.09, 0.27, 0.15, 0.02, 0.18, 0.03, 0.01, 0.07],
-            "Offset":2160,
+            "Coefficient":[0.46, 0, 0.14, 0.28, 0, 0.06, 0.02, 0.14, 0],
+            "Offset":-7280,
             "Multiplier":0.001
         },
         {
@@ -213,8 +217,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0, 0, 0, 0.13, 0.14, 0.14, 0.24, 0.22],
-            "Offset":2210,
+            "Coefficient":[0.07, 0, 0, 0, 0, 0.28, 0.15, 0.02, 0.3],
+            "Offset":4010,
             "Multiplier":0.001
         },
         {
@@ -224,8 +228,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0],
-            "Offset":3000,
+            "Coefficient":[0.27, 0.06, 0.3, 0, 0, 0.2, 0.03, 0.02, 0.04],
+            "Offset":10,
             "Multiplier":0.001
         },
         {
@@ -235,8 +239,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.02, 0, 0, 0.04, 0.32, 0.22, 0, 0.08],
-            "Offset":10780,
+            "Coefficient":[0.9, 0, 0.05, 0, 0, 0, 0.01, 0, 0],
+            "Offset":730,
             "Multiplier":0.001
         },
         {
@@ -246,8 +250,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.11, 0.17, 0.19, 0, 0.23, 0, 0.11, 0.04],
-            "Offset":3500,
+            "Coefficient":[0.08, 0.02, 0.24, 0.23, 0, 0.29, 0.01, 0, 0],
+            "Offset":1870,
             "Multiplier":0.001
         },
         {
@@ -257,8 +261,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.05, 0.24, 0.17, 0, 0.32, 0.02, 0, 0],
-            "Offset":5130,
+            "Coefficient":[0, 0, 0, 0.04, 0.2, 0.07, 0.15, 0.3, 0.16],
+            "Offset":-440,
             "Multiplier":0.001
         },
         {
@@ -268,21 +272,54 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0, 0.08, 0, 0.01, 0.81, 0.03, 0, 0],
-            "Offset":1530,
+            "Coefficient":[0, 0.01, 0, 0, 0.07, 0.28, 0.25, 0.02, 0.08],
+            "Offset":9170,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SUB-8",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0],
+            "Offset":1140,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SUB-9",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.02, 0.05, 0.21, 0.13, 0.02, 0.29, 0.09, 0, 0],
+            "Offset":5160,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SUB-10",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0, 0, 0.16, 0, 0.49, 0.35, 0, 0, 0],
+            "Offset":-1500,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"4.0",
+            "Version":"5.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2",
                     "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5",
-                    "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+                    "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8", "VIRTUAL-SKIN-SUB-9", "VIRTUAL-SKIN-SUB-10"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
@@ -629,8 +666,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.11, 0.01, 0.08, 0, 0, 0.22, 0.02, 0.08, 0.32],
-            "Offset":1430,
+            "Coefficient":[0, 0.14, 0, 0.15, 0, 0, 0, 0.88, 0],
+            "Offset":-11750,
             "Multiplier":0.001
         },
         {
@@ -640,8 +677,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.02, 0, 0.14, 0, 0.29, 0.11, 0.08, 0.3, 0.14],
-            "Offset":-9650,
+            "Coefficient":[0.01, 0.18, 0, 0, 0, 0.24, 0, 0.01, 0.35],
+            "Offset":3600,
             "Multiplier":0.001
         },
         {
@@ -651,53 +688,19 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.12, 0, 0.13, 0, 0.02, 0.17, 0.2, 0.05, 0.23],
-            "Offset":-3450,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"VIRTUAL-SKIN-SPEAKER-SUB-3",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.38, 0, 0, 0.01, 0.03, 0, 0.48, 0.1],
-            "Offset":-3420,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"VIRTUAL-SKIN-SPEAKER-SUB-4",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.04, 0, 0, 0.03, 0, 0, 0.14, 0.36, 0.29],
-            "Offset":-3490,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"VIRTUAL-SKIN-SPEAKER-SUB-5",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.05, 0, 0, 0, 0.22, 0.21, 0, 0.5, 0],
-            "Offset":-2550,
+            "Coefficient":[0, 0.01, 0, 0, 0.13, 0.31, 0.11, 0.18, 0.09],
+            "Offset":2140,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"1.0",
+            "Version":"2.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2",
-                           "VIRTUAL-SKIN-SPEAKER-SUB-3", "VIRTUAL-SKIN-SPEAKER-SUB-4", "VIRTUAL-SKIN-SPEAKER-SUB-5"],
-            "Coefficient":[1, 1, 1, 1, 1, 1],
+            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"],
+            "Coefficient":[1, 1, 1],
             "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
@@ -710,8 +713,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.05, 0.02, 0.01, 0, 0.49, 0.04, 0.12, 0.07, 0.12],
-            "Offset":760,
+            "Coefficient":[0.04, 0.16, 0.19, 0.16, 0.17, 0, 0.01, 0.24, 0],
+            "Offset":-820,
             "Multiplier":0.001
         },
         {
@@ -721,8 +724,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0],
-            "Offset":3000,
+            "Coefficient":[0.02, 0.01, 0.04, 0.04, 0.4, 0.14, 0.1, 0.02, 0.12],
+            "Offset":1840,
             "Multiplier":0.001
         },
         {
@@ -732,19 +735,30 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.09, 0.19, 0.08, 0.17, 0.36, 0.04, 0, 0, 0],
-            "Offset":1290,
+            "Coefficient":[0.18, 0.1, 0.15, 0.13, 0.22, 0.16, 0.02, 0.04, 0.01],
+            "Offset":-2810,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-3",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0],
+            "Offset":1140,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"3.0",
+            "Version":"4.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
-            "Coefficient":[1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 9305354..238f192 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -3,7 +3,7 @@
         {
             "Name":"north_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 29.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 38.8, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
@@ -13,7 +13,7 @@
         {
             "Name":"cam_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 34.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
@@ -23,7 +23,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 43.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 41.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -33,7 +33,7 @@
         {
             "Name":"charge_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 49.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 42.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
@@ -43,7 +43,7 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 28.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 31.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
@@ -69,7 +69,7 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 35.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 35.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
@@ -185,8 +185,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.31, 0.09, 0.25, 0, 0, 0.32, 0, 0, 0],
-            "Offset":-40,
+            "Coefficient":[0.06, 0.15, 0.3, 0.09, 0, 0.36, 0, 0, 0],
+            "Offset":-250,
             "Multiplier":0.001
         },
         {
@@ -196,8 +196,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07],
-            "Offset":2780,
+            "Coefficient":[0.13, 0.24, 0.19, 0.06, 0.3, 0.03, 0.07, 0, 0.01],
+            "Offset":-2140,
             "Multiplier":0.001
         },
         {
@@ -207,8 +207,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.07, 0.01, 0.07, 0, 0.03, 0.05, 0.1, 0.41, 0.12],
-            "Offset":3720,
+            "Coefficient":[0.03, 0.01, 0, 0.01, 0.07, 0.34, 0.01, 0.41, 0.05],
+            "Offset":1880,
             "Multiplier":0.001
         },
         {
@@ -218,8 +218,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.43, 0.32, 0.03, 0.04, 0.07, 0.14, 0, 0],
-            "Offset":-4010,
+            "Coefficient":[0.27, 0.1, 0.09, 0.25, 0.01, 0.17, 0.03, 0.01, 0.02],
+            "Offset":740,
             "Multiplier":0.001
         },
         {
@@ -229,8 +229,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0, 0, 0, 0.02, 0.02, 0.62, 0.13, 0.1],
-            "Offset":-1320,
+            "Coefficient":[0, 0, 0.07, 0, 0.18, 0.21, 0.12, 0.03, 0.24],
+            "Offset":3450,
             "Multiplier":0.001
         },
         {
@@ -240,8 +240,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0],
-            "Offset":1360,
+            "Coefficient":[0.1, 0.64, 0.16, 0, 0, 0, 0, 0, 0],
+            "Offset":2180,
             "Multiplier":0.001
         },
         {
@@ -251,8 +251,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.36, 0.2, 0.14, 0.01, 0.08, 0.18, 0.05, 0, 0.02],
-            "Offset":-2810,
+            "Coefficient":[0.02, 0.08, 0.32, 0.28, 0, 0.12, 0.06, 0, 0],
+            "Offset":1820,
             "Multiplier":0.001
         },
         {
@@ -262,8 +262,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.08, 0.3, 0.21, 0, 0.2, 0.01, 0, 0],
-            "Offset":5450,
+            "Coefficient":[0, 0.15, 0, 0, 0.06, 0.07, 0.14, 0.35, 0.11],
+            "Offset":3110,
             "Multiplier":0.001
         },
         {
@@ -273,14 +273,14 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.7, 0.18, 0, 0, 0, 0, 0, 0],
-            "Offset":2410,
+            "Coefficient":[0, 0, 0, 0, 0.29, 0.21, 0.25, 0.02, 0.07],
+            "Offset":4680,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"4.0",
+            "Version":"5.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
@@ -634,8 +634,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0, 0.01, 0, 0, 0, 0, 0.91, 0],
-            "Offset":1100,
+            "Coefficient":[0, 0, 0, 0, 0.68, 0, 0, 0.52, 0],
+            "Offset":-11260,
             "Multiplier":0.001
         },
         {
@@ -645,19 +645,41 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0, 0.05, 0, 0.35, 0, 0, 0.67, 0],
-            "Offset":-5910,
+            "Coefficient":[0, 0.07, 0.01, 0, 0, 0, 0, 0.94, 0],
+            "Offset":-3310,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SPEAKER-SUB-2",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0, 0, 0, 0, 0, 0.3, 0.08, 0.27, 0.15],
+            "Offset":4260,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SPEAKER-SUB-3",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.02, 0.01, 0, 0, 0.02, 0.37, 0.01, 0.15, 0.21],
+            "Offset":4580,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"1.0",
+            "Version":"2.0",
             "VirtualSensor":true,
             "TriggerSensor":["soc_therm", "disp_therm", "quiet_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
-            "Coefficient":[1, 1],
+            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2", "VIRTUAL-SKIN-SPEAKER-SUB-3"],
+            "Coefficient":[1, 1, 1, 1],
             "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
@@ -670,8 +692,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.01, 0.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07],
-            "Offset":2780,
+            "Coefficient":[0.28, 0.14, 0.17, 0.13, 0.02, 0.19, 0, 0, 0],
+            "Offset":1280,
             "Multiplier":0.001
         },
         {
@@ -681,8 +703,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0, 0.08, 0.01, 0.03, 0.21, 0.2, 0.22, 0.13, 0],
-            "Offset":3910,
+            "Coefficient":[0.07, 0.05, 0.18, 0.19, 0.43, 0, 0.1, 0, 0],
+            "Offset":-3320,
             "Multiplier":0.001
         },
         {
@@ -692,8 +714,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0],
-            "Offset":1360,
+            "Coefficient":[0, 0, 0, 0.21, 0.17, 0.20, 0.07, 0.04, 0.18],
+            "Offset":2960,
             "Multiplier":0.001
         },
         {
@@ -703,19 +725,52 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
-            "Coefficient":[0.16, 0.03, 0.32, 0.16, 0, 0.11, 0.13, 0, 0],
-            "Offset":1190,
+            "Coefficient":[0.06, 0.06, 0.05, 0, 0.17, 0.13, 0, 0.4, 0.09],
+            "Offset":1010,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-4",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.06, 0.14, 0.01, 0.16, 0.09, 0.31, 0.01, 0.13, 0.02],
+            "Offset":1750,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-5",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0, 0.14, 0.31, 0.11, 0.06, 0.13, 0.16, 0, 0],
+            "Offset":1500,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-6",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
+            "Coefficient":[0.01, 0.02, 0.33, 0.09, 0.62, 0, 0, 0, 0],
+            "Offset":-5080,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"3.0",
+            "Version":"4.0",
             "VirtualSensor":true,
             "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
             "Multiplier":0.001,

From 153e46e11dde1d5e4e43d11db5a423b376046d6f Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Wed, 12 Jul 2023 07:12:47 +0000
Subject: [PATCH 3/4] thermal: remove HotHysteresis for CPU-MID and CPU-HIGH
 loop

We found that CPU-MID loop will cause big bouncing (~2 degC) during
light loading test (burncycle with dutycycle), we can avoid such
bouncing by remove stop CPU-MID loop at 39.
Apply same change on CPU-HIGH to avoid similar issue.

Bug: 286773651
Test: run burn8 / burncycle_wih_dutycycle / gb5
Change-Id: I11cfbb940a556793ce1fe6d08ff06fc1df55d52a
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal/thermal_info_config_husky.json | 4 ++--
 thermal/thermal_info_config_shiba.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index fc4817f..86e317e 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -415,7 +415,7 @@
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
             "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
-            "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
+            "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
@@ -486,7 +486,7 @@
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
             "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
-            "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 0.0, 0.0, 0.0],
+            "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 238f192..2e37654 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -383,7 +383,7 @@
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
             "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
-            "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
+            "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
@@ -454,7 +454,7 @@
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
             "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
-            "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 0.0, 0.0, 0.0],
+            "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,

From 7c382dd43beca2417d74a00eef546693a5cf8c4d Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Thu, 20 Jul 2023 10:00:25 +0800
Subject: [PATCH 4/4] audio: Recording tuning table update - 9th Ver.

DVT1.0 table check-in for DVT1.0-DM04 RC Exit
Change list of new table:

Camcorder path
1. remove all AZ gain in surround module
2. MBDRC
   gain_dB low/mid/high  24/24/24
   Min_Gain_dB low/mid/high  -29/-29/-29
   threshold_dB[0] low/mid/high  -85/-85/-89
   threshold_dB[1] low/mid/high  -33/-33/-33
   kneeWidth[0] 6/6/6
   kneeWidth[1] 6/6/6
   attackTime[0] 100/100/100
   attackTime[1] 10/10/10
   attackTime[2] 20/20/20
   releaseTime[0] 300/300/300
   releaseTime[1] 20/20/20
   releaseTime[2] 100/100/20
   limiter: gain_dB: 3, threshold_dB: -3.3, atrt fix in 5

Mic path
1. MBDRC
   limiter: gain_dB: 3, threshold_dB: -3.3, atrt fix in 5

Test: verify by HW darren
Bug: 291942899
Bug: 292018225
Change-Id: I62e7459be6017c8d86c0534af19e07ee968eb828
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
---
 audio/husky/tuning/bluenote/recording.gatf | Bin 187732 -> 98580 bytes
 audio/shiba/tuning/bluenote/recording.gatf | Bin 187732 -> 98580 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/husky/tuning/bluenote/recording.gatf b/audio/husky/tuning/bluenote/recording.gatf
index d4e4481981756d48dab93ceab1a91bcb9646aa19..c387c7f61e2af82c68446619d27e9b12a0fc5bb2 100644
GIT binary patch
delta 692
zcmcbzi+f5FTS!T1UNTQ3BSTqgQ638e0|O%v1I5w})-f=omL#St0Qv6icji2FZkRSH
zr_f%iZ&Cg+9hTCt>{k;HJXv$Xb=P;M?9|F)37|SKI3Q@S-K3Fm+8V|Kleu@wPTIw#
zbijdu0fa%|gcAdUf+GXN0w4x~Y0e<_<O4h9rbpdj5|}KuQ;29SdW@SUzuze>ip_k5
z$@04ld1lR=xesW*0|-y=$zW7aILw$HdQ-lvN66W0CAZX`l1*0Tr|OPL9bO{3Y<cCZ
zIERfc54b~t?s70T7Cr#eDhw3h0OA+S3=ADW4tfBwRB^{WkPG~JJao?z3xS&l<;o7r
z38pI^d&k)IBg=BZ32*>SUbstmdx}0&-yjVc0eOKnh5tmvkL%`}L>vC<vHZ1zdD*1@
zM_(NKp7g48n$-3)8H^lUn|-)$Fa`j_2N*!Xcmqg-2a$q~Z&GJ|6g&0MItkzRKXYXD
iG97teF?@eG`%)r{WQhI5W843fFh1Z`00uGMa0dXdd(&P3

delta 1355
zcmbQz#CByDw@XQBUb4?!CWf-qqC6G`1_nkT28yL?@Gvl>mL#St0QqO9^%|b`kO}><
zR(;X6+U3b2&z#yWzL{m~I5DC8bbh|)=9+a6xZ}^B@!1E$3=9qSAS?{j$pOSKm>C#4
zfE<vi3hNN2X2e-m_M6&d^WRKTOwG|>V4`!5_mD2viA|qPL{>eT<(HjWSq#z-1_uN;
zpWYQKxcPt}p8yks!{!T$Qr(O@rteQ@l+~FvbEX|k9Rq`dBLtstVqjPRWP>mWOmk*n
zIN>yT!CJZLyV4m27*|X_zgAiaBtuY#9z?MyR>hP5uQd#W_*(&J)d?q<zfXXSmWPHW
zlE0;%C-Gg`{yC-L_8VRXrYOOQPk&m?V642T#kasf%v>T7<Zpq=8+QqBKC>%J5$M^;
z7ZhDK*W9_*HF!MCgY4nSHtQ4=uI;WmI$fD%=8u3Q^Pg=hIRDYdqjXoQpP8?7!B)<D
zA;-5r$zbH*Vq}{9agp-$2WgB&UORxH_2M8CC{P(z9Rj8mAO-^mQ0gHoQdw7k%$a^Z
zol#r~WEA0;Mbd#gdNF;QaQ^PEE4loByF!l0{SuiZ(DyUpj^n%3JN7eK=jXhd(Xw5n
zl<@&~1Tk4c11V`d6@Hm4=lS8Q)3J7ei3fkNZfkTCmOOUlTAtviIa_9(VE`u$puaYT
zOj|Q}5<>`bV!)RAk#qg-+_lf2ED7uTu{C06Ow`e`qP~g)@$*@~x$Wq_c=K_8H7wU}
OKC-KC5cyFCpC18TwUi40

diff --git a/audio/shiba/tuning/bluenote/recording.gatf b/audio/shiba/tuning/bluenote/recording.gatf
index b72debcb3a400a1f4f1e69dd6499c8e6b688e0fa..dd4671524b6dc2b8af06c830d9b811e302cb1228 100644
GIT binary patch
delta 599
zcmcbzi+f5FTS!T1UNTQ3BSTqgQ638e0|O%v1I5w})-f=omL#St0Qn}Rk$<&Y3`4%3
z*buqh^Z2sNHqMRzGs`E{RLXCv*PShyomyEe0aOPD2LuhaU&&ycwubS*<lAdxCtq00
zrF6i7fdPa;;Di$cgMuRi!vY`%foaYl_T&j`<);5S%p@@R*%~3@_2@Bfn!JClv?w+U
z6eho4YZy3d=FELS3miaL7-$^_5T5{I2YF0?p8Q}DAe*hDwbp)5m}kD#Os}+3mu!Vs
zyLz{;yy%(DUkdi;<id5r8-4l)hxd4py*E83hEYL5^~(0hW_6v_!RouBv{po@PJMQK
z(?soM6SntsGVj)V+O$37BGUtIP%t<c8w($pZgZDO!T=QG8a#*?XG$=*xTUM$QKFMA
nS6lxoMO*iuhZ}s8*Bot_*JHjrUTgcD7)EqMwtqRoWWWOeqtCyk

delta 584
zcmbQz#CByDw@*oFUb4?!CWf-qqC6G`1_nkT28yLCtYctEElEsQ0P^RBT)bd6^Mw<i
z%58hes~@7Zmw10#!{Jf)TJ4rZ-t0=A?9|F)4xqZtQ`YsZVcapjKblc?`h|MNxXG8+
zN=$caU<`pV6ee@6Q=9&yfl<a3WQhinCE1H5kHnraoX@h+j+0BE<M}EHFD8E<H7~}F
z*;jshsaS(75t!V#PI&X2by<o`3=WeoD7tL+xp1wENE@fO#4rjdsQrH7b|db1qS-WY
z^{s#2?rRt2a*bfQ@Kw+1xSpJX$b{`rG8i9lbDTZnvk!!)&&gnvHAZr#e(wY4TU-0r
z#GVR%(fRSqHQ{&XWL!KSc81u!;rghZZwPiKFf2BPOd~cZ?9szJ`}NfgyLA2b|2?(R
z+RCDZae0nrTzXh_&X!Jw<z7E$8N<RGXbl6y0m03)*To8MJ|M^^01TDQ7ZjzsNePkd
zUrHDicp!lj;@hK{;MUInNlR_De`U(%<Tv*Ir(GIqjs-d2kr#d+v3*Mndf-R^0DutZ
A!2kdN