From beb111be3404129eb0a34066e4ace53d8427078e Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Sat, 16 Apr 2022 20:46:51 +0800 Subject: [PATCH 1/4] Phase out config_roundedCornerMultipleRadius from overlay package [P10/C10] Phasing out config_roundedCornerMultipleRadius config from device overlay package. Bug: 224688507 Test: Build ROM and pass presubmit test Change-Id: I325157ca5163d9c429724000be73c07728fbdc45 --- .../frameworks/base/packages/SystemUI/res/values/config.xml | 2 -- .../frameworks/base/packages/SystemUI/res/values/config.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index c830b26..c292f1d 100644 --- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -47,8 +47,6 @@ 0 - true - M 662,72 diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 79a1d07..ebaa70a 100644 --- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -53,8 +53,6 @@ --> M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71 - true - M 494,67 From c7574a18e969fcd5e967823966f3804203012d0f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 21 Apr 2022 16:32:48 +0800 Subject: [PATCH 2/4] Reduce FG prefer_idle when display is idle Bug: 178016953 Test: build Signed-off-by: Wei Wang Change-Id: If3770c4de98cbbd2f36cc7401d9ac284473c10d4 --- powerhint-cheetah-a0.json | 15 +++++++++++++++ powerhint-cheetah.json | 15 +++++++++++++++ powerhint-cloudripper.json | 15 +++++++++++++++ powerhint-panther-a0.json | 15 +++++++++++++++ powerhint-panther.json | 15 +++++++++++++++ powerhint-ravenclaw.json | 15 +++++++++++++++ 6 files changed, 90 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 384987b..cac640e 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -236,6 +236,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -1247,6 +1256,12 @@ "Type": "MaskHint", "Value": "BOOST_120HZ" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "TAUClampBoost", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index b73496f..0741724 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -237,6 +237,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -1254,6 +1263,12 @@ "Type": "MaskHint", "Value": "BOOST_120HZ" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "TAUClampBoost", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 8502dd0..9235e7f 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -194,6 +194,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -336,6 +345,12 @@ "Type": "MaskHint", "Value": "INTERACTION_120" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index c32479c..f7bebd3 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -235,6 +235,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -1230,6 +1239,12 @@ "Type": "MaskHint", "Value": "BOOST_90HZ" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "TAUClampBoost", diff --git a/powerhint-panther.json b/powerhint-panther.json index b40c442..fe2f175 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -236,6 +236,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -1237,6 +1246,12 @@ "Type": "MaskHint", "Value": "BOOST_90HZ" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "TAUClampBoost", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 8502dd0..9235e7f 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -194,6 +194,15 @@ ], "ResetOnInit": true }, + { + "Name": "FGPreferIdle", + "Path": "/proc/vendor_sched/fg_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "CDPreferHighCap", "Path": "/proc/vendor_sched/cam_prefer_high_cap", @@ -336,6 +345,12 @@ "Type": "MaskHint", "Value": "INTERACTION_120" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From 4edc5e5aef4eb15996c32ac726e20a0773d365cc Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 21 Apr 2022 18:18:24 +0000 Subject: [PATCH 3/4] Revert "powerhint: Remove unused TAUClampBoost value" Revert submission 16977206-powerhint_remove_unused_value Reason for revert: resolve merge conflict Reverted Changes: Icd80b1195:powerhint: Remove unused TAUClampBoost value I21ad42d98:powerhint: Remove unused TAUClampBoost value Change-Id: I59400b9f71e02c9f491a513334a8ffa195be7015 --- powerhint-cheetah.json | 1 + powerhint-panther.json | 1 + 2 files changed, 2 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 14a058e..53f3d79 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -138,6 +138,7 @@ "553", "158", "108", + "43", "1", "157", "53" diff --git a/powerhint-panther.json b/powerhint-panther.json index 67f41ce..c076a5f 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -137,6 +137,7 @@ "Values": [ "553", "108", + "43", "1", "107", "53" From 09b55b3d91569a62192f4662f3aa0fda19031bc8 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 19 Apr 2022 20:44:35 +0000 Subject: [PATCH 4/4] thermal: update virtual coefficients to 0.5 version Update virtual-skin, virtual-skin-charge and cellular-emergency sensors to 0.5 version coefficients. Added "Version" field for virtual-skin node for identifying the version of coefficients. Bug: 229418131, 227477863 Test: Build and boot on device. Check virtual-skin readings Signed-off-by: Sayanna Chandula Change-Id: I709fa1dfa5304416335bba1a7cb21a267e00c744 --- thermal_info_config_cheetah.json | 128 +++++++++-------------------- thermal_info_config_panther.json | 133 ++++++++++--------------------- 2 files changed, 78 insertions(+), 183 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index aa4433f..39d6a26 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -83,9 +83,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["quiet_therm", "usb_pwr_therm2"], - "Coefficient":[1.208, -0.208], - "Offset":-874, + "Combination":["quiet_therm","usb_pwr_therm2"], + "Coefficient":[1.1, -0.1], + "Offset":-900, "Multiplier":0.001 }, { @@ -95,29 +95,41 @@ "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":["neutral_therm", "quiet_therm"], - "Coefficient":[0.6, 0.4], - "Offset":-500, + "Coefficient":[0.378, 0.622], + "Offset":-453, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NEUTRAL-USB", + "Name":"VIRTUAL-QI-QUIET", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "usb_pwr_therm"], - "Coefficient":[0.460, 0.540], - "Offset":-3200, + "Combination":["qi_therm","quiet_therm"], + "Coefficient":[0.3, 0.7], + "Offset":-500, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QI-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["qi_therm", "disp_therm"], + "Coefficient":[0.257, 0.743], + "Offset":-268, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", + "Version":"0.5", "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], + "Coefficient":[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, @@ -142,8 +154,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -202,7 +214,7 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"], + "Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], @@ -246,8 +258,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], - "Coefficient":["1.0", "1.0", "1.0"], + "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], + "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], "Multiplier":0.001, @@ -260,24 +272,8 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm", - "usb_pwr_therm2" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm", "usb_pwr_therm2"], + "Coefficient":[1.0, -1.0], "Multiplier":0.001 }, { @@ -285,24 +281,8 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm", - "neutral_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm", "neutral_therm"], + "Coefficient":[1.0, -1.0], "Multiplier":0.001 }, { @@ -311,25 +291,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", - "Combination":[ - "usb_pwr_therm", - "USB-MINUS-USB2", - "USB-MINUS-NEUTRAL" - ], - "Coefficient":[ - "42000", - "4000", - "7000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], + "Coefficient":[42000, 4000,7000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", @@ -347,25 +311,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", - "Combination":[ - "usb_pwr_therm", - "USB-MINUS-USB2", - "USB-MINUS-NEUTRAL" - ], - "Coefficient":[ - "47000", - "4500", - "8000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], + "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], + "Coefficient":[47000, 4500, 8000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 03f1eb6..f51b057 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -56,14 +56,14 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-QUIET-USB", + "Name":"VIRTUAL-GNSS-QUIET", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.973, 0.027], - "Offset":-2200, + "Combination":["gnss_tcxo_therm", "quiet_therm"], + "Coefficient":[1.3, -0.3], + "Offset":-1800, "Multiplier":0.001 }, { @@ -84,8 +84,8 @@ "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":["gnss_tcxo_therm", "disp_therm"], - "Coefficient":[0.550, 0.450], - "Offset":3000, + "Coefficient":[0.9, 0.1], + "Offset":-700, "Multiplier":0.001 }, { @@ -95,29 +95,40 @@ "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":["neutral_therm", "quiet_therm"], - "Coefficient":[0.6, 0.4], - "Offset":-400, + "Coefficient":[0.3, 0.7], + "Offset":-500, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NEUTRAL-USB", + "Name":"VIRTUAL-QI-QUIET", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "usb_pwr_therm"], - "Coefficient":[0.6, 0.4], - "Offset":-4000, + "Combination":["qi_therm", "quiet_therm"], + "Coefficient":[0.3, 0.7], + "Offset":-1400, + }, + { + "Name":"VIRTUAL-QI-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["qi_therm","disp_therm"], + "Coefficient":[0.2, 0.8], + "Offset":-900, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", + "Version":"0.5", "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"], + "Coefficient":[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, @@ -142,8 +153,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -202,7 +213,7 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"], + "Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], @@ -246,8 +257,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"], + "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], "Multiplier":0.001, @@ -260,24 +271,8 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm", - "usb_pwr_therm2" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm", "usb_pwr_therm2"], + "Coefficient":[1.0, -1.0], "Multiplier":0.001 }, { @@ -285,24 +280,8 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm", - "neutral_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm", "neutral_therm"], + "Coefficient":[1.0, -1.0], "Multiplier":0.001 }, { @@ -311,25 +290,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", - "Combination":[ - "usb_pwr_therm", - "USB-MINUS-USB2", - "USB-MINUS-NEUTRAL" - ], - "Coefficient":[ - "40000", - "1500", - "3000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], + "Coefficient":[40000, 1500, 3000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", @@ -347,25 +310,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", - "Combination":[ - "usb_pwr_therm", - "USB-MINUS-USB2", - "USB-MINUS-NEUTRAL" - ], - "Coefficient":[ - "42000", - "2000", - "4000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], + "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], + "Coefficient":[42000, 2000, 4000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true,