diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 4dc7b759..80ea9670 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -126,8 +126,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.1, 0.06, 0.01, 0.0, 0.33, 0.28, 0.06, 0.04, 0.03], - "Offset": 2060.0, + "Coefficient": [0.28, 0.14, 0.0, 0.01, 0.0, 0.0, 0.09, 0.03, 0.49], + "Offset": -830.0, "Multiplier": 0.001 }, { @@ -137,8 +137,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.31, 0.0, 0.09, 0.03, 0.0, 0.18, 0.15, 0.0, 0.21], - "Offset": 850.0, + "Coefficient": [0.22, 0.0, 0.04, 0.0, 0.02, 0.0, 0.05, 0.15, 0.6], + "Offset": -3060.0, "Multiplier": 0.001 }, { @@ -148,8 +148,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.3, 0.07, 0.15, 0.12, 0.23, 0.02, 0.02, 0.0, 0.02], - "Offset": 1270.0, + "Coefficient": [0.26, 0.13, 0.03, 0.0, 0.0, 0.0, 0.1, 0.06, 0.39], + "Offset": 1060.0, "Multiplier": 0.001 }, { @@ -159,20 +159,30 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.07, 0.0, 0.0, 0.01, 0.34, 0.29, 0.02, 0.12, 0.08], - "Offset": 1330.0, + "Coefficient": [0.27, 0.04, 0.05, 0.0, 0.0, 0.02, 0.1, 0.03, 0.63], + "Offset": -4280.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.26, 0.14, 0.12, 0.06, 0.0, 0.0, 0.28, 0.0, 0.16], + "Offset": -700.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", - "VIRTUAL-SKIN-SUB-3"], - "Coefficient":[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"], + "Coefficient": [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, @@ -581,30 +591,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.02, 0.04, 0.03, 0.33, 0.03, 0.16, 0.06, 0.33], - "Offset": -630.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.02, 0.15, 0.01, 0.03, 0.0, 0.23, 0.07, 0.38], - "Offset": 3900.0, + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.96], + "Offset": 3450.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], - "Coefficient":[1.0, 1.0], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], + "Coefficient":[1.0], "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, @@ -619,8 +618,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.32, 0.0, 0.0, 0.0, 0.01, 0.12, 0.12, 0.04, 0.31], - "Offset": 2680.0, + "Coefficient": [0.29, 0.17, 0.0, 0.22, 0.0, 0.0, 0.21, 0.05, 0.01], + "Offset": 1740.0, "Multiplier": 0.001 }, { @@ -630,8 +629,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.29, 0.0, 0.05, 0.0, 0.28, 0.08, 0.06, 0.01, 0.12], - "Offset": 3280.0, + "Coefficient": [0.29, 0.21, 0.0, 0.16, 0.0, 0.0, 0.17, 0.05, 0.07], + "Offset": 1430.0, "Multiplier": 0.001 }, { @@ -641,14 +640,14 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.25, 0.0, 0.03, 0.0, 0.36, 0.0, 0.0, 0.02, 0.24], - "Offset": 3300.0, + "Coefficient": [0.29, 0.19, 0.0, 0.23, 0.0, 0.0, 0.17, 0.05, 0.0], + "Offset": 2310.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", @@ -663,8 +662,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.31, 0.05, 0.05, 0.02, 0.18, 0.17, 0.04, 0.06, 0.0], - "Offset": 2000.0, + "Coefficient": [0.28, 0.04, 0.0, 0.04, 0.01, 0.05, 0.08, 0.08, 0.45], + "Offset": -1010.0, "Multiplier": 0.001 }, { @@ -674,41 +673,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.18, 0.02, 0.06, 0.16, 0.27, 0.2, 0.0, 0.07, 0.0], - "Offset": -30.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.17, 0.0, 0.14, 0.04, 0.18, 0.11, 0.04, 0.04, 0.23], - "Offset": 1200.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.02, 0.05, 0.08, 0.32, 0.18, 0.0, 0.14, 0.05], - "Offset": 3110.0, + "Coefficient": [0.27, 0.08, 0.08, 0.0, 0.0, 0.0, 0.05, 0.05, 0.47], + "Offset": -220.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "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], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient": [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, @@ -906,6 +883,10 @@ { "Name": "VIRTUAL-SKIN-SUB-3", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] } ] }, diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index 7f9cce36..3fdb48ec 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -92,8 +92,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.31, 0.05, 0.05, 0.02, 0.18, 0.17, 0.04, 0.06, 0.0], - "Offset": 2000.0, + "Coefficient": [0.28, 0.04, 0.0, 0.04, 0.01, 0.05, 0.08, 0.08, 0.45], + "Offset": -1010.0, "Multiplier": 0.001 }, { @@ -103,41 +103,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.18, 0.02, 0.06, 0.16, 0.27, 0.2, 0.0, 0.07, 0.0], - "Offset": -30.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.17, 0.0, 0.14, 0.04, 0.18, 0.11, 0.04, 0.04, 0.23], - "Offset": 1200.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.02, 0.05, 0.08, 0.32, 0.18, 0.0, 0.14, 0.05], - "Offset": 3110.0, + "Coefficient": [0.27, 0.08, 0.08, 0.0, 0.0, 0.0, 0.05, 0.05, 0.47], + "Offset": -220.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], - "Coefficient": [1, 1, 1, 1], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient": [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_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 08e55b4c..7e6a8228 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -86,104 +86,47 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.11, 0.0, 0.24, 0.02, 0.14, 0.04, 0.08, 0.38], - "Offset": -660.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], - "Offset": 1290.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.08, 0.01, 0.05, 0.37, 0.07, 0.02, 0.25, 0.07], - "Offset": 1360.0, - "Multiplier":0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.04, 0.04, 0.0, 0.23, 0.01, 0.07, 0.52, 0.02], - "Offset": -3910.0, + "Coefficient": [0.27, 0.06, 0.0, 0.0, 0.07, 0.0, 0.26, 0.21, 0.11], + "Offset": 530.0, "Multiplier": 0.001 }, { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.05, 0.14, 0.0, 0.07, 0.01, 0.0, 0.2, 0.23, 0.25], - "Offset": 1190.0, + "Coefficient": [0.27, 0.12, 0.0, 0.0, 0.01, 0.0, 0.13, 0.21, 0.2], + "Offset": 1530.0, "Multiplier": 0.001 }, { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.0, 0.04, 0.2, 0.28, 0.31, 0.05, 0.0, 0.01], - "Offset": 3850.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.11, 0.02, 0.44, 0.0, 0.33, 0.12, 0.05, 0.05], - "Offset": -7060.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-7", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.37, 0.0, 0.0, 0.13, 0.0, 0.01, 0.03, 0.17, 0.2], - "Offset": 2190.0, + "Coefficient": [0.29, 0.05, 0.0, 0.02, 0.01, 0.02, 0.19, 0.22, 0.19], + "Offset": 40.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", - "VIRTUAL-SKIN-CHARGE-SUB-6", "VIRTUAL-SKIN-CHARGE-SUB-7"], - "Coefficient": [1, 1, 1, 1, 1, 1, 1, 1], + "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_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 09a44705..2dd48b7b 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -92,85 +92,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.0, 0.17, 0.02, 0.49, 0.07, 0.03, 0.11, 0.01], - "Offset": -1090.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.02, 0.0, 0.0, 0.13, 0.17, 0.38, 0.03, 0.0, 0.18], - "Offset": 2210.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.01, 0.07, 0.01, 0.33, 0.23, 0.01, 0.0, 0.24], - "Offset": 3220.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.22, 0.09, 0.17, 0.04, 0.2, 0.2, 0.01, 0.11, 0.01], - "Offset": -9850.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.07, 0.1, 0.0, 0.03, 0.26, 0.24, 0.18, 0.0, 0.06], - "Offset": 770.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.24, 0.04, 0.07, 0.19, 0.28, 0.0, 0.06, 0.01, 0.08], - "Offset": -320.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.07, 0.03, 0.12, 0.0, 0.28, 0.26, 0.04, 0.05, 0.09], - "Offset": -1120.0, + "Coefficient": [0.24, 0.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09], + "Offset": -1200.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "VIRTUAL-SKIN-CHARGE-SUB-6"], - "Coefficient": [1, 1, 1, 1, 1, 1, 1], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0"], + "Coefficient": [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_komodo.json b/thermal/thermal_info_config_komodo.json index 076b788f..aea23e94 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -120,92 +120,58 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.09, 0.0, 0.0, 0.24, 0.31, 0.19, 0.01, 0.0], - "Offset": 5590.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.0, 0.21, 0.02, 0.15, 0.22, 0.03, 0.05, 0.26], - "Offset": 410.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.32, 0.0, 0.01, 0.4, 0.0, 0.0, 0.01, 0.13, 0.09], - "Offset": 2240.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], - "Offset": 1290.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.34, 0.0, 0.0, 0.0, 0.14, 0.0, 0.0, 0.31, 0.0], - "Offset": 8080.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-5", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.2, 0.02, 0.0, 0.16, 0.0, 0.27, 0.1, 0.19], - "Offset": 1220.0, - "Multiplier":0.001 - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", + "Name": "VIRTUAL-SKIN-SUB-0", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.14, 0.03, 0.02, 0.0, 0.0, 0.22, 0.22, 0.34], - "Offset": 500.0, + "Coefficient": [0.26, 0.01, 0.0, 0.48, 0.0, 0.0, 0.0, 0.23, 0.0], + "Offset": 980.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.32, 0.06, 0.03, 0.08, 0.05, 0.0, 0.03, 0.21, 0.1], + "Offset": 3820.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.34, 0.05, 0.0, 0.04, 0.0, 0.0, 0.22, 0.25, 0.04], + "Offset": 1920.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.35, 0.04, 0.01, 0.11, 0.09, 0.0, 0.01, 0.2, 0.15], + "Offset": 1150.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"6.0", + "Version":"7.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], + "Coefficient": [1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -614,14 +580,14 @@ "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.03, 0.09, 0.0, 0.04, 0.0, 0.07, 0.17, 0.0, 0.83], - "Offset": -11820.0, + "Coefficient": [0.17, 0.01, 0.04, 0.0, 0.0, 0.01, 0.22, 0.0, 0.58], + "Offset": -1210.0, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", @@ -635,182 +601,80 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", + "Name": "VIRTUAL-SKIN-FRONT-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.05, 0.02, 0.0, 0.09, 0.18, 0.37, 0.08, 0.05, 0.06], - "Offset": 2350.0, - "Multiplier":0.001 + "Coefficient": [0.19, 0.0, 0.0, 0.38, 0.08, 0.25, 0.0, 0.02, 0.0], + "Offset": 3110.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", + "Name": "VIRTUAL-SKIN-FRONT-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.03, 0.13, 0.06, 0.28, 0.3, 0.0, 0.05, 0.07, 0.01], - "Offset": 1130.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.05, 0.06, 0.0, 0.63, 0.1, 0.03, 0.0, 0.06, 0.0], - "Offset": 2680.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.11, 0.01, 0.0, 0.54, 0.0, 0.0, 0.08, 0.0, 0.11], - "Offset": 5900.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.03, 0.02, 0.38, 0.15, 0.24, 0.02, 0.05, 0.0], - "Offset": 1810.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-5", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.33, 0.0, 0.0, 0.12, 0.04, 0.17, 0.02, 0.04, 0.16], - "Offset": 3140.0, - "Multiplier":0.001 + "Coefficient": [0.2, 0.0, 0.0, 0.4, 0.0, 0.3, 0.0, 0.03, 0.0], + "Offset": 2510.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "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", "VIRTUAL-SKIN-FRONT-SUB-5"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1"], + "Coefficient":[1.0, 1.0], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.11, 0.0, 0.24, 0.02, 0.14, 0.04, 0.08, 0.38], - "Offset": -660.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], - "Offset": 1290.0, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.08, 0.01, 0.05, 0.37, 0.07, 0.02, 0.25, 0.07], - "Offset": 1360.0, - "Multiplier":0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.04, 0.04, 0.0, 0.23, 0.01, 0.07, 0.52, 0.02], - "Offset": -3910.0, + "Coefficient": [0.27, 0.06, 0.0, 0.0, 0.07, 0.0, 0.26, 0.21, 0.11], + "Offset": 530.0, "Multiplier": 0.001 }, { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.05, 0.14, 0.0, 0.07, 0.01, 0.0, 0.2, 0.23, 0.25], - "Offset": 1190.0, + "Coefficient": [0.27, 0.12, 0.0, 0.0, 0.01, 0.0, 0.13, 0.21, 0.2], + "Offset": 1530.0, "Multiplier": 0.001 }, { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.0, 0.04, 0.2, 0.28, 0.31, 0.05, 0.0, 0.01], - "Offset": 3850.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.11, 0.02, 0.44, 0.0, 0.33, 0.12, 0.05, 0.05], - "Offset": -7060.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-7", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.37, 0.0, 0.0, 0.13, 0.0, 0.01, 0.03, 0.17, 0.2], - "Offset": 2190.0, + "Coefficient": [0.29, 0.05, 0.0, 0.02, 0.01, 0.02, 0.19, 0.22, 0.19], + "Offset": 40.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", - "VIRTUAL-SKIN-CHARGE-SUB-6", "VIRTUAL-SKIN-CHARGE-SUB-7"], - "Coefficient": [1.0, 1.0, 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"], + "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, @@ -1008,18 +872,6 @@ { "Name": "VIRTUAL-SKIN-SUB-3", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-4", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-5", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] } ] }, diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index b05b134b..f62361fc 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -116,8 +116,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.12, 0.19, 0.0, 0.03, 0.02, 0.0, 0.27, 0.14, 0.17], - "Offset": 740.0, + "Coefficient": [0.12, 0.08, 0.0, 0.03, 0.0, 0.08, 0.11, 0.0, 0.64], + "Offset": -270.0, "Multiplier": 0.001 }, { @@ -127,8 +127,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.13, 0.01, 0.09, 0.17, 0.3, 0.11, 0.0, 0.06], - "Offset": 4150.0, + "Coefficient": [0.24, 0.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09], + "Offset": -1200.0, "Multiplier": 0.001 }, { @@ -138,19 +138,30 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.1, 0.01, 0.0, 0.07, 0.1, 0.59, 0.0, 0.0, 0.0], - "Offset": 4130.0, + "Coefficient": [0.17, 0.01, 0.0, 0.05, 0.0, 0.21, 0.45, 0.0, 0.16], + "Offset": -360.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.22, 0.04, 0.0, 0.54, 0.0, 0.09, 0.0, 0.0, 0.16], + "Offset": -840.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"6.0", + "Version":"7.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"], - "Coefficient": [1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"], + "Coefficient": [1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -559,8 +570,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.32, 0.0, 0.0, 0.0, 0.0, 0.38, 0.0, 0.0], - "Offset": 8390.0, + "Coefficient": [0.1, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.97], + "Offset": 70.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.17, 0.0, 0.92], + "Offset": 910.0, "Multiplier": 0.001 }, { @@ -570,8 +592,8 @@ "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], + "Coefficient":[1.0, 1.0], "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, @@ -586,8 +608,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.09, 0.04, 0.24, 0.04, 0.35, 0.12, 0.07, 0.02, 0.01], - "Offset": -3990.0, + "Coefficient": [0.0, 0.12, 0.0, 0.42, 0.0, 0.29, 0.08, 0.0, 0.01], + "Offset": 3760.0, "Multiplier": 0.001 }, { @@ -597,8 +619,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.0, 0.0, 0.29, 0.07, 0.46, 0.04, 0.0, 0.04], - "Offset": 2170.0, + "Coefficient": [0.0, 0.15, 0.0, 0.5, 0.0, 0.25, 0.08, 0.0, 0.01], + "Offset": 1320.0, "Multiplier": 0.001 }, { @@ -608,42 +630,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.21, 0.0, 0.07, 0.18, 0.0, 0.3, 0.13, 0.04], - "Offset": 860.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-FRONT-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.11, 0.08, 0.54, 0.0, 0.2, 0.0, 0.0, 0.0], - "Offset": 2450.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-FRONT-SUB-4", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.16, 0.02, 0.18, 0.25, 0.2, 0.05, 0.0, 0.03], - "Offset": 3410.0, + "Coefficient": [0.0, 0.14, 0.0, 0.5, 0.0, 0.26, 0.09, 0.0, 0.0], + "Offset": 1370.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "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.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], + "Coefficient":[1.0, 1.0, 1.0], "Multiplier":0.001 }, { @@ -653,85 +652,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.04, 0.0, 0.17, 0.02, 0.49, 0.07, 0.03, 0.11, 0.01], - "Offset": -1090.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.02, 0.0, 0.0, 0.13, 0.17, 0.38, 0.03, 0.0, 0.18], - "Offset": 2210.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.0, 0.01, 0.07, 0.01, 0.33, 0.23, 0.01, 0.0, 0.24], - "Offset": 3220.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.22, 0.09, 0.17, 0.04, 0.2, 0.2, 0.01, 0.11, 0.01], - "Offset": -9850.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.07, 0.1, 0.0, 0.03, 0.26, 0.24, 0.18, 0.0, 0.06], - "Offset": 770.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.24, 0.04, 0.07, 0.19, 0.28, 0.0, 0.06, 0.01, 0.08], - "Offset": -320.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.07, 0.03, 0.12, 0.0, 0.28, 0.26, 0.04, 0.05, 0.09], - "Offset": -1120.0, + "Coefficient": [0.24, 0.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09], + "Offset": -1200.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "VIRTUAL-SKIN-CHARGE-SUB-6"], - "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0"], + "Coefficient": [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, @@ -921,6 +854,10 @@ { "Name": "VIRTUAL-SKIN-SUB-2", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] } ] },