From 6475f8db2e24e3d0d08046526872a629dd56c220 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 19 Apr 2023 00:47:19 +0800 Subject: [PATCH] thermal: update virtual sensor euqation Update VIRTUAL-SKIN, VIRTUAL-SKIN-CHAEGE and add VIRTUAL-SKIN-SPEAKER Bug: 277782111 Test: adb shell dumpsys android.hardware.thermal.IThermal/default Change-Id: Ibb82e0f51b27edca153e333f963ccd6f2243da47 --- thermal_info_config_charge_husky.json | 63 ++++++++--- thermal_info_config_charge_shiba.json | 79 ++++++++++--- thermal_info_config_husky.json | 136 ++++++++++++++++++----- thermal_info_config_shiba.json | 154 +++++++++++++++----------- 4 files changed, 311 insertions(+), 121 deletions(-) diff --git a/thermal_info_config_charge_husky.json b/thermal_info_config_charge_husky.json index 7ed0825..ea9bd66 100644 --- a/thermal_info_config_charge_husky.json +++ b/thermal_info_config_charge_husky.json @@ -9,7 +9,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -19,7 +19,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 32, "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, @@ -29,7 +29,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 40.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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", "Multiplier":0.001, @@ -48,7 +48,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -58,7 +58,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -68,7 +68,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 52.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -78,7 +78,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 37.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -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.17, 0.11, 0.11, 0.11, 0.13, 0.11, 0.11, 0.11, 0.21], - "Offset":-6920, + "Coefficient":[0.04, 0.02, 0.01, 0.12, 0.66, 0.12, 0, 0, 0], + "Offset":340, "Multiplier":0.001 }, { @@ -103,18 +103,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.58, 0.02, 0, 0.2, 0, 0, 0.03, 0.19, 0], - "Offset":-800, + "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-SKIN-CHARGE", "Type":"UNKNOWN", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], - "Coefficient":[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"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -175,7 +209,6 @@ "Combination":["USB-MINUS-QUIET", "VSYS_PWR_RFFE"], "CombinationType":["SENSOR", "ODPM"], "Coefficient":[1, -6], - "Offset":-4000, "Multiplier":0.001 }, { @@ -185,7 +218,7 @@ "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], - "Coefficient":[46000, 46000, 10000, 0], + "Coefficient":[46000, 46000, 10000, 4000], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { diff --git a/thermal_info_config_charge_shiba.json b/thermal_info_config_charge_shiba.json index 8d63c43..54bb0bd 100644 --- a/thermal_info_config_charge_shiba.json +++ b/thermal_info_config_charge_shiba.json @@ -9,7 +9,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 43.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/neutral_therm/tz_temp", "Multiplier":0.001, @@ -19,7 +19,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 34.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, @@ -29,7 +29,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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", "Multiplier":0.001, @@ -48,7 +48,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.6, "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/cam_therm/tz_temp", "Multiplier":0.001, @@ -58,7 +58,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -68,7 +68,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 49.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -78,7 +78,12 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp" + "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", @@ -87,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.29, 0, 0, 0.27, 0.49, 0.01, 0.06, 0, 0.05], - "Offset":-6650, + "Coefficient":[0, 0, 0.07, 0.25, 0.03, 0.41, 0, 0.02, 0.05], + "Offset":5390, "Multiplier":0.001 }, { @@ -98,18 +103,63 @@ "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.21, 0.02, 0, 0.25, 0, 0.22, 0, 0.17, 0.08], - "Offset":1710, + "Coefficient":[0, 0, 0.12, 0.2, 0.09, 0.34, 0, 0.04, 0.04], + "Offset":5540, + "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-CHARGE", "Type":"UNKNOWN", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], - "Coefficient":[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"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -170,7 +220,6 @@ "Combination":["USB-MINUS-QUIET", "VSYS_PWR_RFFE"], "CombinationType":["SENSOR", "ODPM"], "Coefficient":[1, -8], - "Offset":-5000, "Multiplier":0.001 }, { @@ -180,7 +229,7 @@ "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB_QUIET_RFFE"], - "Coefficient":[46000, 46000, 10000, 0], + "Coefficient":[46000, 46000, 10000, 5000], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json index 9e7b28c..5e57d88 100644 --- a/thermal_info_config_husky.json +++ b/thermal_info_config_husky.json @@ -9,7 +9,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -19,7 +19,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 32, "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, @@ -29,7 +29,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 40.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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", "Multiplier":0.001, @@ -141,7 +141,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -151,7 +151,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -161,7 +161,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 52.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -171,7 +171,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 37.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -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.12, 0.11, 0.23, 0.04, 0.11, 0.11, 0.11, 0.11, 0.03], - "Offset":0, + "Coefficient":[0.24, 0.31, 0.09, 0.05, 0.21, 0.08, 0.01, 0, 0], + "Offset":-610, "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, 0, 0, 0, 0, 0.44, 0, 0.11, 0.27], - "Offset":4840, + "Coefficient":[0.08, 0.11, 0.24, 0.11, 0.04, 0.28, 0.01, 0, 0], + "Offset":2900, "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.11, 0.10, 0, 0.11, 0.13, 0.11, 0.18, 0.1, 0.07], - "Offset":2540, + "Coefficient":[0.01, 0, 0, 0, 0.32, 0.21, 0.18, 0.08, 0.09], + "Offset":2790, "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, 0, 0.22, 0, 0.24, 0, 0.50], - "Offset":-6750, + "Coefficient":[0.05, 0, 0.01, 0, 0.28, 0.18, 0.06, 0.02, 0.28], + "Offset":2830, "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.04, 0.54, 0, 0.3, 0.02, 0, 0], - "Offset":2090, + "Coefficient":[0.02, 0, 0.37, 0.06, 0.39, 0.06, 0, 0.12, 0], + "Offset":-4050, "Multiplier":0.001 }, { @@ -240,8 +240,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.16, 0.46, 0.03, 0.21, 0.04, 0, 0], - "Offset":1200, + "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 }, { @@ -251,8 +284,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.17, 0.11, 0.11, 0.11, 0.13, 0.11, 0.11, 0.11, 0.21], - "Offset":-6920, + "Coefficient":[0.04, 0.02, 0.01, 0.12, 0.66, 0.12, 0, 0, 0], + "Offset":340, "Multiplier":0.001 }, { @@ -262,8 +295,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.58, 0.02, 0, 0.2, 0, 0, 0.03, 0.19, 0], - "Offset":-800, + "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 }, { @@ -276,15 +342,28 @@ "Offset":7194, "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.09, 0.01, 0, 0.18, 0.2, 0.21, 0, 0.35, 0.03], + "Offset":-4990, + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_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"], - "Coefficient":[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, @@ -440,11 +519,12 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], - "Coefficient":[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"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json index 9182527..9a81b03 100644 --- a/thermal_info_config_shiba.json +++ b/thermal_info_config_shiba.json @@ -9,7 +9,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 43.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/neutral_therm/tz_temp", "Multiplier":0.001, @@ -19,7 +19,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 34.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, @@ -29,7 +29,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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", "Multiplier":0.001, @@ -141,7 +141,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.6, "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/cam_therm/tz_temp", "Multiplier":0.001, @@ -151,7 +151,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -161,7 +161,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 49.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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, @@ -171,7 +171,12 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp" + "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", @@ -180,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, 0.01, 0.29, 0.13, 0.21, 0.23, 0.04, 0, 0], - "Offset":2080, + "Coefficient":[0.29, 0.03, 0.36, 0.21, 0.29, 0, 0, 0, 0], + "Offset":-10640, "Multiplier":0.001 }, { @@ -191,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.03, 0, 0.07, 0.01, 0.2, 0.16, 0.26, 0.06, 0.11], - "Offset":1740, + "Coefficient":[0.01, 0.05, 0.29, 0.25, 0.01, 0.26, 0, 0, 0], + "Offset":2630, "Multiplier":0.001 }, { @@ -202,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":[1.0, 0, 0, 0, 0, 0, 0, 0, 0], - "Offset":340, + "Coefficient":[0, 0.12, 0.23, 0.24, 0, 0.24, 0, 0.01, 0], + "Offset":4310, "Multiplier":0.001 }, { @@ -213,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.06, 0.02, 0.3, 0.12, 0.22, 0.08, 0, 0, 0], - "Offset":6430, + "Coefficient":[0, 0, 0.01, 0, 0.41, 0.14, 0.23, 0, 0.08], + "Offset":3650, "Multiplier":0.001 }, { @@ -224,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.32, 0, 0, 0.47, 0], - "Offset":7980, + "Coefficient":[0, 0, 0, 0.21, 0.05, 0.19, 0.02, 0.24, 0.12], + "Offset":5530, "Multiplier":0.001 }, { @@ -235,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.05, 0.4, 0.21, 0.07, 0.03, 0.03, 0, 0.1, 0], - "Offset":2990, + "Coefficient":[0, 0.01, 0.3, 0.25, 0, 0.35, 0, 0, 0], + "Offset":1040, "Multiplier":0.001 }, { @@ -246,41 +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.12, 0.16, 0.05, 0.22, 0.19, 0.13, 0, 0, 0], - "Offset":4150, - "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.3, 0.12, 0.25, 0.26, 0.09, 0.04, 0.04, 0, 0], - "Offset":-6810, - "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.05, 0.21, 0.19, 0.09, 0.23, 0.09, 0, 0, 0], - "Offset":5060, - "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.03, 0.18, 0.21, 0.15, 0.14, 0.05, 0, 0.07, 0], - "Offset":5740, + "Coefficient":[0.02, 0.16, 0.11, 0.19, 0.45, 0, 0, 0, 0], + "Offset":1760, "Multiplier":0.001 }, { @@ -290,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.29, 0, 0, 0.27, 0.49, 0.01, 0.06, 0, 0.05], - "Offset":-6650, + "Coefficient":[0, 0, 0.07, 0.25, 0.03, 0.41, 0, 0.02, 0.05], + "Offset":5390, "Multiplier":0.001 }, { @@ -301,19 +273,74 @@ "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.21, 0.02, 0, 0.25, 0, 0.22, 0, 0.17, 0.08], - "Offset":1710, + "Coefficient":[0, 0, 0.12, 0.2, 0.09, 0.34, 0, 0.04, 0.04], + "Offset":5540, + "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, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_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", "VIRTUAL-SKIN-SUB-9"], - "Coefficient":[1.0, 1.0, 1.0, 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"], + "Coefficient":[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, @@ -469,11 +496,12 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], - "Coefficient":[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"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001,