diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index 3c1855c..66d59b6 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -189,135 +189,69 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.27, 0.17, 0.11, 0, 0.2, 0.01, 0.06, 0.08], - "Offset":2110, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Coefficient": [0.187, 0.091, 0.004, 0.062, 0.091, 0.215, 0.228, 0.114, 0.007], + "Offset": 59.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.46, 0, 0.14, 0.28, 0, 0.06, 0.02, 0.14, 0], - "Offset":-7280, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Coefficient": [0.032, 0.187, 0.216, 0.0, 0.036, 0.004, 0.194, 0.046, 0.286], + "Offset": -71.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.07, 0, 0, 0, 0, 0.28, 0.15, 0.02, 0.3], - "Offset":4010, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Coefficient": [0.213, 0.122, 0.014, 0.01, 0.117, 0.019, 0.208, 0.187, 0.11], + "Offset": -241.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.27, 0.06, 0.3, 0, 0, 0.2, 0.03, 0.02, 0.04], - "Offset":10, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Coefficient": [0.124, 0.168, 0.153, 0.017, 0.064, 0.006, 0.248, 0.051, 0.169], + "Offset": 63.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.9, 0, 0.05, 0, 0, 0, 0.01, 0, 0], - "Offset":730, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-5", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.08, 0.02, 0.24, 0.23, 0, 0.29, 0.01, 0, 0], - "Offset":1870, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-6", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0, 0.04, 0.2, 0.07, 0.15, 0.3, 0.16], - "Offset":-440, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-7", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.07, 0.28, 0.25, 0.02, 0.08], - "Offset":9170, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-8", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-9", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.05, 0.21, 0.13, 0.02, 0.29, 0.09, 0, 0], - "Offset":5160, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-10", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.16, 0, 0.49, 0.35, 0, 0, 0], - "Offset":-1500, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Coefficient": [0.017, 0.098, 0.062, 0.222, 0.157, 0.0, 0.215, 0.013, 0.217], + "Offset": 595.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-LEGACY", "Type":"UNKNOWN", + "Version":"2.0", "VirtualSensor":true, "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", "VIRTUAL-SKIN-SUB-10"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "TriggerSensor": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -350,7 +284,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-LEGACY"], "Coefficient":[1.0], - "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.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, "SendCallback":true, @@ -376,7 +310,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0], + "HotThreshold":["NAN", 37.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, "SendPowerHint":true, @@ -392,7 +326,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 47.0, 49.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, @@ -444,7 +378,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 49.0, 51.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, @@ -515,8 +449,8 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 51.0, 53.0, 62.0, "NAN", "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0], + "HotThreshold":["NAN", 41.0, 43.0, "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, @@ -606,7 +540,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 47.0, 53.0, 55.0, 56.5, 62.0, 75.0], + "HotThreshold":["NAN", 37.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, "PollingDelay":300000, @@ -670,7 +604,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 53.0, 55.0, 56.5, 62.0, "NAN", "NAN"], + "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, @@ -991,18 +925,6 @@ "Name": "VIRTUAL-SKIN-SUB-4", "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] }, - { - "Name": "VIRTUAL-SKIN-SUB-5", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "LoggingName": "MODEL-LEGACY-1",