From e33ce497c50fdea37d8a266f3ed7a592aae69828 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 7 Jun 2023 19:46:42 -0700 Subject: [PATCH] thermal: update VSKIN equation based on EVT1.1 results Bug: 286111703 Test: adb shell dumpsys android.hardware.thermal.IThermal/default Test: adb shell dumpsys thermalservice Change-Id: I7fa4f0f482e419d46f9c0dd030d1dcc02f6dcb5e --- thermal/thermal_info_config_charge_husky.json | 154 ++--- thermal/thermal_info_config_charge_shiba.json | 156 ++--- thermal/thermal_info_config_husky.json | 596 +++++++++++------- thermal/thermal_info_config_shiba.json | 445 ++++++++----- 4 files changed, 767 insertions(+), 584 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index fae13bd..37350ce 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -1,5 +1,55 @@ { "Sensors":[ + { + "Name":"north_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 32.5, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 33.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/cam_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 45.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/soc_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 52.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 33.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, { "Name":"battery", "Type":"BATTERY", @@ -9,29 +59,15 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 49.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/neutral_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { - "Name":"north_therm", + "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 35.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/north_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"charge_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 56.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", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,46 +81,6 @@ "PollingDelay":60000, "PassiveDelay":7000 }, - { - "Name":"cam_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.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/cam_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"disp_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 30.9, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"soc_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 50.5, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"quiet_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 36.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/quiet_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", "Type":"UNKNOWN", @@ -92,8 +88,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.04, 0.02, 0.01, 0.12, 0.66, 0.12, 0, 0, 0], - "Offset":340, + "Coefficient":[0.05, 0.02, 0.01, 0, 0.49, 0.04, 0.12, 0.07, 0.12], + "Offset":760, "Multiplier":0.001 }, { @@ -103,8 +99,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.13, 0, 0, 0.08, 0.77, 0.03, 0, 0, 0], - "Offset":-880, + "Coefficient":[0.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0], + "Offset":3000, "Multiplier":0.001 }, { @@ -114,41 +110,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.03, 0.12, 0.26, 0.08, 0.2, 0, 0.06, 0.01, 0.06], - "Offset":3950, - "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.29, 0, 0, 0, 0.7, 0.15, 0, 0, 0], - "Offset":-6040, - "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.23, 0, 0.01, 0.08, 0.68, 0, 0.01, 0, 0], - "Offset":-750, + "Coefficient":[0.09, 0.19, 0.08, 0.17, 0.36, 0.04, 0, 0, 0], + "Offset":1290, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.1", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "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", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], + "Coefficient":[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 4d930ab..84e0beb 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -1,5 +1,55 @@ { "Sensors":[ + { + "Name":"north_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 29.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/north_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 34.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 43.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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 49.5, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 28.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/disp_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, { "Name":"battery", "Type":"BATTERY", @@ -9,7 +59,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 41.5, "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, @@ -17,21 +67,11 @@ "PassiveDelay":7000 }, { - "Name":"north_therm", + "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 34.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 35.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/north_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"charge_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 47.3, "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", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,46 +85,6 @@ "PollingDelay":60000, "PassiveDelay":7000 }, - { - "Name":"cam_therm", - "Type":"UNKNOWN", - "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/cam_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"disp_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.9, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"soc_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 46.3, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"quiet_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 34, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", "Type":"UNKNOWN", @@ -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, 0, 0.07, 0.25, 0.03, 0.41, 0, 0.02, 0.05], - "Offset":5390, + "Coefficient":[0.01, 0.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07], + "Offset":2780, "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, 0.12, 0.2, 0.09, 0.34, 0, 0.04, 0.04], - "Offset":5540, + "Coefficient":[0, 0.08, 0.01, 0.03, 0.21, 0.2, 0.22, 0.13, 0], + "Offset":3910, "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.29, 0.03, 0.36, 0.21, 0.29, 0, 0, 0, 0], - "Offset":-10640, + "Coefficient":[0.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0], + "Offset":1360, "Multiplier":0.001 }, { @@ -125,41 +125,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, 0.01, 0.3, 0.25, 0, 0.35, 0, 0, 0], - "Offset":1040, - "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, 0.31, 0.08, 0.29, 0.1, 0, 0.16, 0], - "Offset":-1970, - "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.02, 0.16, 0.11, 0.19, 0.45, 0, 0, 0, 0], - "Offset":1760, + "Coefficient":[0.16, 0.03, 0.32, 0.16, 0, 0.11, 0.13, 0, 0], + "Offset":1190, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.1", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "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", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], - "Coefficient":[1.0, 1.0, 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"], + "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, @@ -238,7 +216,7 @@ } ], "Multiplier":1, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 } ], diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 6a1a2e9..0ba5fe2 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -1,5 +1,55 @@ { "Sensors":[ + { + "Name":"north_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 32.5, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 33.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/cam_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 45.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/soc_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 52.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 33.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, { "Name":"battery", "Type":"BATTERY", @@ -9,29 +59,15 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 49.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/neutral_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { - "Name":"north_therm", + "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 35.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/north_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"charge_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 56.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", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -138,200 +174,6 @@ "PollingDelay":0, "PassiveDelay":1000 }, - { - "Name":"cam_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.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/cam_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"disp_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 30.9, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"soc_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 50.5, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"quiet_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 36.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/quiet_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"VIRTUAL-SKIN-SUB-0", - "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.24, 0.31, 0.09, 0.05, 0.21, 0.08, 0.01, 0, 0], - "Offset":-610, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-1", - "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.08, 0.11, 0.24, 0.11, 0.04, 0.28, 0.01, 0, 0], - "Offset":2900, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-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.01, 0, 0, 0, 0.32, 0.21, 0.18, 0.08, 0.09], - "Offset":2790, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-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.05, 0, 0.01, 0, 0.28, 0.18, 0.06, 0.02, 0.28], - "Offset":2830, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-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.02, 0, 0.37, 0.06, 0.39, 0.06, 0, 0.12, 0], - "Offset":-4050, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-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.13, 0, 0, 0.08, 0.77, 0.03, 0, 0, 0], - "Offset":-880, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-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.29, 0, 0, 0, 0.7, 0.15, 0, 0, 0], - "Offset":-6040, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-7", - "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.11, 0.05, 0.04, 0.13, 0.55, 0.02, 0, 0.07, 0], - "Offset":330, - "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.23, 0, 0.01, 0.08, 0.68, 0, 0.01, 0, 0], - "Offset":-750, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "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.02, 0.01, 0.12, 0.66, 0.12, 0, 0, 0], - "Offset":340, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "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.13, 0, 0, 0.08, 0.77, 0.03, 0, 0, 0], - "Offset":-880, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-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.03, 0.12, 0.26, 0.08, 0.2, 0, 0.06, 0.01, 0.06], - "Offset":3950, - "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.29, 0, 0, 0, 0.7, 0.15, 0, 0, 0], - "Offset":-6040, - "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.23, 0, 0.01, 0.08, 0.68, 0, 0.01, 0, 0], - "Offset":-750, - "Multiplier":0.001 - }, { "Name":"VIRTUAL-BTS-WINDOW-PARTIAL", "Type":"UNKNOWN", @@ -343,30 +185,104 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-SPEAKER", + "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", - "Version":"1.0", + "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.09, 0.01, 0, 0.18, 0.2, 0.21, 0, 0.35, 0.03], - "Offset":-4990, - "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, - "SendCallback":true + "Coefficient":[0.33, 0.02, 0.50, 0, 0, 0, 0.06, 0, 0], + "Offset":-1530, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-1", + "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.09, 0.27, 0.15, 0.02, 0.18, 0.03, 0.01, 0.07], + "Offset":2160, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-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.13, 0.14, 0.14, 0.24, 0.22], + "Offset":2210, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-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.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0], + "Offset":3000, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-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, 0.02, 0, 0, 0.04, 0.32, 0.22, 0, 0.08], + "Offset":10780, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-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.01, 0.11, 0.17, 0.19, 0, 0.23, 0, 0.11, 0.04], + "Offset":3500, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-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, 0.05, 0.24, 0.17, 0, 0.32, 0.02, 0, 0], + "Offset":5130, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-7", + "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.08, 0, 0.01, 0.81, 0.03, 0, 0], + "Offset":1530, + "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "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", "VIRTUAL-SKIN-SUB-8"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "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], "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, @@ -389,7 +305,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -405,7 +321,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -457,7 +373,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -506,7 +422,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -555,7 +471,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -619,7 +535,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -647,15 +563,144 @@ } ] }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[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, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER-SUB-0", + "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.11, 0.01, 0.08, 0, 0, 0.22, 0.02, 0.08, 0.32], + "Offset":1430, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", + "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, 0.14, 0, 0.29, 0.11, 0.08, 0.3, 0.14], + "Offset":-9650, + "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.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, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER", + "Type":"UNKNOWN", + "Version":"1.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], + "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, + "SendCallback":true + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", + "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.02, 0.01, 0, 0.49, 0.04, 0.12, 0.07, 0.12], + "Offset":760, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", + "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.14, 0.01, 0.16, 0.1, 0.42, 0, 0.02, 0.03, 0], + "Offset":3000, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-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.09, 0.19, 0.08, 0.17, 0.36, 0.04, 0, 0, 0], + "Offset":1290, + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.1", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "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", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], + "Coefficient":[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, @@ -691,19 +736,48 @@ ] }, { - "Name":"cellular-emergency", - "Type":"POWER_AMPLIFIER", + "Name":"VIRTUAL-SKIN-FRONT-SUB-0", + "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "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.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04], + "Offset":1850, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-SUB-1", + "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.35, 0.22, 0.22, 0.07, 0.03, 0, 0], + "Offset":-560, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-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.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0], + "Offset":5070, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT", + "Type":"UNKNOWN", + "Version":"1.0", + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN"], - "Coefficient":[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, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000 + "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], + "Coefficient":[1, 1, 1], + "Multiplier":0.001 }, { "Name":"USB-MINUS-NEUTRAL", @@ -889,6 +963,38 @@ "Name": "VIRTUAL-SKIN", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] }, + { + "Name": "VIRTUAL-SKIN-SUB-0", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-1", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-2", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-5", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-7", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, { "Name": "VIRTUAL-SKIN-CHARGE", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index dff7c2d..1294333 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -1,5 +1,55 @@ { "Sensors":[ + { + "Name":"north_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 29.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/north_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"cam_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 34.9, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"soc_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 43.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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"charge_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 49.5, "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, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 28.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/disp_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, { "Name":"battery", "Type":"BATTERY", @@ -9,7 +59,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 41.5, "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, @@ -17,21 +67,11 @@ "PassiveDelay":7000 }, { - "Name":"north_therm", + "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 34.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 35.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/north_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"charge_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 47.3, "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", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -138,46 +178,6 @@ "PollingDelay":0, "PassiveDelay":1000 }, - { - "Name":"cam_therm", - "Type":"UNKNOWN", - "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/cam_therm/tz_temp", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"disp_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.9, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"soc_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 46.3, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, - { - "Name":"quiet_therm", - "Type":"UNKNOWN", - "HotThreshold":["NAN", 34, "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, - "PollingDelay":60000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", @@ -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.29, 0.03, 0.36, 0.21, 0.29, 0, 0, 0, 0], - "Offset":-10640, + "Coefficient":[0.31, 0.09, 0.25, 0, 0, 0.32, 0, 0, 0], + "Offset":-40, "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.05, 0.29, 0.25, 0.01, 0.26, 0, 0, 0], - "Offset":2630, + "Coefficient":[0.01, 0.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07], + "Offset":2780, "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, 0.12, 0.23, 0.24, 0, 0.24, 0, 0.01, 0], - "Offset":4310, + "Coefficient":[0.07, 0.01, 0.07, 0, 0.03, 0.05, 0.1, 0.41, 0.12], + "Offset":3720, "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, 0.01, 0, 0.41, 0.14, 0.23, 0, 0.08], - "Offset":3650, + "Coefficient":[0, 0.43, 0.32, 0.03, 0.04, 0.07, 0.14, 0, 0], + "Offset":-4010, "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.21, 0.05, 0.19, 0.02, 0.24, 0.12], - "Offset":5530, + "Coefficient":[0, 0, 0, 0, 0.02, 0.02, 0.62, 0.13, 0.1], + "Offset":-1320, "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, 0.01, 0.3, 0.25, 0, 0.35, 0, 0, 0], - "Offset":1040, + "Coefficient":[0.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0], + "Offset":1360, "Multiplier":0.001 }, { @@ -251,99 +251,43 @@ "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.16, 0.11, 0.19, 0.45, 0, 0, 0, 0], - "Offset":1760, + "Coefficient":[0.36, 0.2, 0.14, 0.01, 0.08, 0.18, 0.05, 0, 0.02], + "Offset":-2810, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", + "Name":"VIRTUAL-SKIN-SUB-7", "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.07, 0.25, 0.03, 0.41, 0, 0.02, 0.05], - "Offset":5390, + "Coefficient":[0.01, 0.08, 0.3, 0.21, 0, 0.2, 0.01, 0, 0], + "Offset":5450, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", + "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, 0, 0.12, 0.2, 0.09, 0.34, 0, 0.04, 0.04], - "Offset":5540, + "Coefficient":[0, 0.7, 0.18, 0, 0, 0, 0, 0, 0], + "Offset":2410, "Multiplier":0.001 }, - { - "Name":"VIRTUAL-SKIN-CHARGE-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.29, 0.03, 0.36, 0.21, 0.29, 0, 0, 0, 0], - "Offset":-10640, - "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, 0.01, 0.3, 0.25, 0, 0.35, 0, 0, 0], - "Offset":1040, - "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, 0.31, 0.08, 0.29, 0.1, 0, 0.16, 0], - "Offset":-1970, - "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.02, 0.16, 0.11, 0.19, 0.45, 0, 0, 0, 0], - "Offset":1760, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER", - "Type":"UNKNOWN", - "Version":"1.0", - "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, 0.31, 0.08, 0.29, 0.1, 0, 0.16, 0], - "Offset":-1970, - "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, - "SendCallback":true - }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"2.0", + "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_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"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "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", "VIRTUAL-SKIN-SUB-8"], + "Coefficient":[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, @@ -366,7 +310,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -382,7 +326,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -434,7 +378,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -483,7 +427,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -532,7 +476,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":"disp_therm", + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -594,9 +538,9 @@ { "Name":"VIRTUAL-SKIN-GPU", "Type":"UNKNOWN", - "Hidden":true, + "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -620,19 +564,114 @@ { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 9, 9, 9, 11, 11, 11] + "CdevCeiling": [0, 8, 8, 9, 11, 11, 11] } ] }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "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"], + "Coefficient":[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, + "SendCallback":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER-SUB-0", + "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.01, 0, 0, 0, 0, 0.91, 0], + "Offset":1100, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", + "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.05, 0, 0.35, 0, 0, 0.67, 0], + "Offset":-5910, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER", + "Type":"UNKNOWN", + "Version":"1.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], + "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, + "SendCallback":true + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", + "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.11, 0.02, 0.1, 0.2, 0.11, 0.27, 0, 0.07], + "Offset":2780, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", + "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.08, 0.01, 0.03, 0.21, 0.2, 0.22, 0.13, 0], + "Offset":3910, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-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.25, 0.25, 0, 0.27, 0.01, 0.08, 0.07, 0, 0], + "Offset":1360, + "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.16, 0.03, 0.32, 0.16, 0, 0.11, 0.13, 0, 0], + "Offset":1190, + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.1", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], + "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", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], - "Coefficient":[1.0, 1.0, 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"], + "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, @@ -668,19 +707,69 @@ ] }, { - "Name":"cellular-emergency", - "Type":"POWER_AMPLIFIER", + "Name":"VIRTUAL-SKIN-FRONT-SUB-0", + "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.42, 0.01, 0.40, 0.02, 0, 0, 0], + "Offset":4110, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-SUB-1", + "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.43, 0.13, 0.34, 0, 0, 0, 0], + "Offset":1060, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-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.29, 0.11, 0.05, 0, 0.36, 0.23, 0, 0.16, 0], + "Offset":-10540, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-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, 0, 0.39, 0.22, 0, 0.17, 0, 0, 0], + "Offset":5340, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-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.03, 0.42, 0.06, 0.21, 0.17, 0, 0.05, 0], + "Offset":-3110, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT", + "Type":"UNKNOWN", + "Version":"1.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN"], - "Coefficient":[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, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000 + "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2", "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4"], + "Coefficient":[1, 1, 1, 1, 1], + "Multiplier":0.001 }, { "Name":"USB-MINUS-NEUTRAL", @@ -726,7 +815,7 @@ } ], "Multiplier":1, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -862,6 +951,42 @@ "Name": "VIRTUAL-SKIN", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] }, + { + "Name": "VIRTUAL-SKIN-SUB-0", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-1", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-2", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-5", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-7", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-8", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, { "Name": "VIRTUAL-SKIN-CHARGE", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]