From 7b4560dad50a4566879d0c137ccc1e887a661678 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Wed, 8 Feb 2023 17:41:50 +0800
Subject: [PATCH] thermal: more aggressive charging throttling

Bug: 239372822
Test: verified by emul_temp
Change-Id: Ie6cdfefd8443a90e93a0a4984de5ac98f979c4aa
---
 thermal_info_config_charge_felix.json         | 7 ++++---
 thermal_info_config_felix.json                | 7 ++++---
 thermal_info_config_proactive_skin_felix.json | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index 870dbc7..3b7a8d5 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -250,7 +250,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
+            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -261,10 +261,11 @@
                 "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+                "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
+                "I_Default":1000
             },
             "ExcludedPowerInfo": [
                 {
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 7f68c75..382f5c2 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -438,7 +438,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
+            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -449,10 +449,11 @@
                 "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+                "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
+                "I_Default":1000
             },
             "ExcludedPowerInfo": [
                 {
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index 387cdfb..bad7e72 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -438,7 +438,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
+            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -449,10 +449,11 @@
                 "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
+                "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
+                "I_Default":1000
             },
             "ExcludedPowerInfo": [
                 {