diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index d836aa1e..85be17a4 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -125,10 +125,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.108, 0.031, 0.064, 0.027, 0.091, 0.013, 0.238, 0.171, 0.143, 3.9], - "Offset": 2783.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.302, 0.138, 0.034, 0.055, 0.061, 0.028, 0.183, 0.022, 0.183], + "Offset": -730.0, "Multiplier": 0.001 }, { @@ -137,10 +136,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.304, 0.042, 0.095, 0.042, 0.115, 0.073, 0.1, 0.018, 0.175, 0.72], - "Offset": 365.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.065, 0.056, 0.02, 0.256, 0.048, 0.084, 0.262, 0.011, 0.265], + "Offset": -1713.0, "Multiplier": 0.001 }, { @@ -149,10 +147,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.103, 0.036, 0.048, 0.189, 0.01, 0.113, 0.217, 0.012, 0.268, 0.1], - "Offset": -239.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135], + "Offset": -458.0, "Multiplier": 0.001 }, { @@ -161,10 +158,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.164, 0.13, 0.029, 0.113, 0.187, 0.204, 0.053, 0.059, 0.045, 0.32], - "Offset": -1925.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.184, 0.014, 0.01, 0.112, 0.197, 0.012, 0.14, 0.181, 0.15], + "Offset": -607.0, "Multiplier": 0.001 }, { @@ -173,22 +169,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.17, 0.012, 0.007, 0.101, 0.106, 0.067, 0.151, 0.189, 0.191, 0.14], - "Offset": -393.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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.077, 0.004, 0.032, 0.185, 0.286, 0.104, 0.292, 0.019, 0.019, 0.2], - "Offset": -750.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.284, 0.274, 0.064, 0.099, 0.166, 0.045, 0.027, 0.019, 0.023], + "Offset": -2856.0, "Multiplier": 0.001 }, { @@ -197,8 +180,8 @@ "Version":"3.1", "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"], - "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"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -280,12 +263,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.032, 0.014, 0.033, 0.083, 0.049, 0.051, 0.073, 0.037, 0.026, 0.1, - 0.001, 0.014, 0.081, 0.001, 0.052, 0, 0.001, 0, 0.012, 0.2, - 0.047, 0.019, 0.078, 0.006, 0.011, 0.052, 0.076, 0.046, 0.084, 0.12], - "Offset": 676.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.076, 0.018, 0.019, 0.006, 0.062, 0.027, 0.029, 0.013, 0.039, + 0.087, 0.018, 0.08, 0.037, 0.037, 0.003, 0.056, 0.081, 0.029, + 0.081, 0.022, 0.019, 0.067, 0.001, 0.071, 0.004, 0.014, 0.006], + "Offset": -636.0, "Multiplier": 0.001 }, { @@ -294,40 +276,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.035, 0.01, 0.056, 0.081, 0.043, 0.069, 0.039, 0.078, 0.046, 1.42, - 0.013, 0.022, 0.011, 0.006, 0.03, 0.016, 0.018, 0.014, 0.01, 1.06, - 0.016, 0.004, 0.062, 0.05, 0.016, 0.065, 0.013, 0.043, 0.048, 0.9], - "Offset": 1939.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.034, 0.032, 0.032, 0.034, 0.032, 0.032, 0.034, 0.032, 0.032, 0, - 0.036, 0.033, 0.035, 0.036, 0.033, 0.035, 0.036, 0.033, 0.035, 0, - 0.037, 0.036, 0.032, 0.037, 0.036, 0.032, 0.037, 0.035, 0.032, 0], - "Offset": 1484.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.073, 0.004, 0.016, 0.033, 0.063, 0.014, 0.065, 0.058, 0.03, 0.02, - 0.071, 0.062, 0.035, 0.001, 0.063, 0.071, 0.027, 0.024, 0.069, 0.04, - 0.006, 0.003, 0.055, 0.029, 0.038, 0.027, 0, 0.008, 0.026, 0.48], - "Offset": -319.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.008, 0.007, 0.004, 0.065, 0.044, 0.022, 0.092, 0.029, 0.069, + 0.035, 0.002, 0.035, 0.02, 0.057, 0.047, 0.09, 0.006, 0.042, + 0.072, 0.004, 0.027, 0.071, 0.037, 0.023, 0.077, 0.021, 0.021], + "Offset": 244.0, "Multiplier": 0.001 }, { @@ -337,8 +290,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-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3"], - "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1"], + "Coefficient": [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, @@ -792,8 +745,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.28, 0.04, 0.0, 0.04, 0.01, 0.05, 0.08, 0.08, 0.45], - "Offset": -1010.0, + "Coefficient": [0.134, 0.074, 0.004, 0.003, 0.323, 0.017, 0.355, 0.064, 0.027], + "Offset": -490.0, "Multiplier": 0.001 }, { @@ -803,8 +756,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.27, 0.08, 0.08, 0.0, 0.0, 0.0, 0.05, 0.05, 0.47], - "Offset": -220.0, + "Coefficient": [0.229, 0.085, 0.081, 0.31, 0.023, 0.221, 0.048, 0.002, 0.002], + "Offset": -2201.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.063, 0.005, 0.08, 0.018, 0.232, 0.052, 0.239, 0.069, 0.242], + "Offset": -457.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.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135], + "Offset": -458.0, "Multiplier": 0.001 }, { @@ -814,8 +789,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-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"], + "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, @@ -1019,10 +994,6 @@ "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", "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 3fdb48ec..8f30d1d8 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.28, 0.04, 0.0, 0.04, 0.01, 0.05, 0.08, 0.08, 0.45], - "Offset": -1010.0, + "Coefficient": [0.134, 0.074, 0.004, 0.003, 0.323, 0.017, 0.355, 0.064, 0.027], + "Offset": -490.0, "Multiplier": 0.001 }, { @@ -103,8 +103,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.27, 0.08, 0.08, 0.0, 0.0, 0.0, 0.05, 0.05, 0.47], - "Offset": -220.0, + "Coefficient": [0.229, 0.085, 0.081, 0.31, 0.023, 0.221, 0.048, 0.002, 0.002], + "Offset": -2201.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.063, 0.005, 0.08, 0.018, 0.232, 0.052, 0.239, 0.069, 0.242], + "Offset": -457.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.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135], + "Offset": -458.0, "Multiplier": 0.001 }, { @@ -114,8 +136,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-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"], + "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, diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 7e6a8228..04daff57 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.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.27, 0.06, 0.0, 0.0, 0.07, 0.0, 0.26, 0.21, 0.11], - "Offset": 530.0, + "Coefficient": [0.039, 0.001, 0.02, 0.107, 0.212, 0.2, 0.17, 0.05, 0.2], + "Offset": -428.0, "Multiplier": 0.001 }, { @@ -103,8 +103,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.27, 0.12, 0.0, 0.0, 0.01, 0.0, 0.13, 0.21, 0.2], - "Offset": 1530.0, + "Coefficient": [0.196, 0.009, 0.087, 0.046, 0.094, 0.007, 0.082, 0.302, 0.178], + "Offset": -2404.0, "Multiplier": 0.001 }, { @@ -114,19 +114,52 @@ "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.05, 0.0, 0.02, 0.01, 0.02, 0.19, 0.22, 0.19], - "Offset": 40.0, + "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231], + "Offset": -442.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.239, 0.019, 0.022, 0.059, 0.139, 0.015, 0.138, 0.203, 0.165], + "Offset": -442.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.334, 0.096, 0.021, 0.029, 0.028, 0.093, 0.165, 0.117, 0.116], + "Offset": -1119.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.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438], + "Offset": -2069.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "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-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient": [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", "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", 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 2dd48b7b..e3acabd4 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -92,19 +92,74 @@ "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.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09], - "Offset": -1200.0, + "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191], + "Offset": -2299.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.11, 0.026, 0.137, 0.254, 0.148, 0.246, 0.008, 0.0, 0.071], + "Offset": -1249.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.128, 0.0, 0.019, 0.181, 0.069, 0.107, 0.121, 0.027, 0.347], + "Offset": -69.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.368, 0.012, 0.047, 0.01, 0.011, 0.358, 0.072, 0.034, 0.089], + "Offset": -4638.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.003, 0.03, 0.003, 0.262, 0.008, 0.292, 0.041, 0.217, 0.144], + "Offset": -1952.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.196, 0.153, 0.006, 0.166, 0.215, 0.18, 0.023, 0.026, 0.035], + "Offset": -2083.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "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-CHARGE-SUB-0"], - "Coefficient": [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", 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 4363c346..63890f56 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -125,10 +125,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.109, 0.058, 0.25, 0.032, 0.195, 0.073, 0.06, 0.064, 0.013, 4.62], - "Offset": -1355.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.209, 0.077, 0.013, 0.209, 0.108, 0.028, 0.082, 0.238, 0.036], + "Offset": -555.0, "Multiplier": 0.001 }, { @@ -137,10 +136,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.012, 0.023, 0.148, 0.19, 0.185, 0.052, 0.196, 0.001, 0.174, 0.4], - "Offset": 225.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.009, 0.117, 0.052, 0.092, 0.123, 0.127, 0.052, 0.287, 0.139], + "Offset": -2505.0, "Multiplier": 0.001 }, { @@ -149,10 +147,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.188, 0.028, 0.019, 0.05, 0.129, 0.047, 0.123, 0.287, 0.124, 0.08], - "Offset": -995.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.099, 0.012, 0.075, 0.354, 0.004, 0.01, 0.195, 0.007, 0.286], + "Offset": -1431.0, "Multiplier": 0.001 }, { @@ -161,10 +158,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.137, 0.046, 0.013, 0.13, 0.045, 0.023, 0.227, 0.044, 0.125, 4.18], - "Offset": 5208.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.356, 0.054, 0.061, 0.089, 0.014, 0.074, 0.055, 0.206, 0.089], + "Offset": -2142.0, "Multiplier": 0.001 }, { @@ -173,10 +169,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.118, 0.077, 0.031, 0.01, 0.171, 0.198, 0.059, 0.212, 0.12, 0.08], - "Offset": -2219.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.151, 0.046, 0.014, 0.092, 0.013, 0.019, 0.127, 0.3, 0.238], + "Offset": -880.0, "Multiplier": 0.001 }, { @@ -185,10 +180,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.079, 0.055, 0.007, 0.035, 0.046, 0.184, 0.028, 0.258, 0.267, 0.82], - "Offset": 209.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231], + "Offset": -442.0, "Multiplier": 0.001 }, { @@ -197,22 +191,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.297, 0.025, 0.0, 0.012, 0.033, 0.091, 0.088, 0.226, 0.209, 0.4], - "Offset": -53.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.014, 0.089, 0.019, 0.283, 0.016, 0.11, 0.357, 0.02, 0.127, 0.36], - "Offset": -1273.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438], + "Offset": -2069.0, "Multiplier": 0.001 }, { @@ -221,8 +202,8 @@ "Version":"7.1", "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"], - "Coefficient": [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], "Multiplier": 0.001 }, { @@ -305,12 +286,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.028, 0.04, 0.081, 0.008, 0.011, 0.043, 0.035, 0.023, 0.008, 1.46, - 0.066, 0.087, 0.013, 0.026, 0.008, 0.048, 0.037, 0.016, 0.016, 1.64, - 0.079, 0.066, 0.009, 0.036, 0.04, 0.023, 0.047, 0.008, 0.032, 1.22], - "Offset": -3701.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.061, 0.055, 0.036, 0.005, 0.01, 0.007, 0.031, 0.068, 0.029, + 0.047, 0.028, 0.026, 0.056, 0.076, 0.075, 0.003, 0.071, 0.003, + 0.016, 0.007, 0.017, 0.048, 0.049, 0.034, 0.022, 0.076, 0.042], + "Offset": -2440.0, "Multiplier": 0.001 }, { @@ -319,12 +299,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.048, 0.031, 0.044, 0.046, 0.024, 0.054, 0.052, 0.03, 0.038, 0.28, - 0.03, 0.02, 0.028, 0.027, 0.048, 0.046, 0.059, 0.027, 0.025, 0.12, - 0.031, 0.054, 0.044, 0.021, 0.044, 0.022, 0.003, 0.034, 0.014, 0.7], - "Offset": 532.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.086, 0.018, 0.022, 0.086, 0.012, 0.02, 0.034, 0.017, 0.016, + 0.007, 0.02, 0.008, 0.085, 0.047, 0.045, 0.081, 0.002, 0.044, + 0.012, 0.04, 0.01, 0.077, 0.058, 0.011, 0.061, 0.021, 0.086], + "Offset": -686.0, "Multiplier": 0.001 }, { @@ -333,12 +312,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.047, 0.062, 0.036, 0.009, 0.023, 0.051, 0.038, 0.065, 0.053, 0.12, - 0.014, 0.023, 0.052, 0.027, 0.016, 0.064, 0.008, 0.005, 0.046, 0.2, - 0.041, 0.015, 0.065, 0.014, 0.021, 0.064, 0.023, 0.023, 0.056, 0.42], - "Offset": 1154.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.065, 0.004, 0.017, 0.064, 0.058, 0.005, 0.08, 0.048, 0.032, + 0.08, 0.006, 0.002, 0.05, 0.05, 0.045, 0.01, 0.069, 0.006, + 0.074, 0.031, 0.002, 0.017, 0.036, 0.004, 0.07, 0.06, 0.016], + "Offset": -76.0, "Multiplier": 0.001 }, { @@ -347,40 +325,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.071, 0.057, 0.02, 0.073, 0.013, 0.042, 0.069, 0.01, 0.017, 0.6, - 0.002, 0.076, 0.065, 0.001, 0.055, 0.055, 0.009, 0.027, 0.075, 0.3, - 0.006, 0.011, 0.003, 0.007, 0.065, 0.028, 0.034, 0.025, 0.018, 0.42], - "Offset": 1248.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-4", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.009, 0.034, 0.048, 0.013, 0.029, 0.058, 0.009, 0.039, 0.062, 0.02, - 0.012, 0.077, 0.028, 0.015, 0.061, 0.084, 0.006, 0.024, 0.012, 1.38, - 0.006, 0.015, 0.015, 0.008, 0.034, 0.041, 0.012, 0.025, 0.081, 1.48], - "Offset": 3509.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-5", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.071, 0.033, 0.03, 0.05, 0.05, 0.018, 0.059, 0.008, 0.028, 0.02, - 0.019, 0.026, 0.078, 0.008, 0.016, 0.061, 0.001, 0.06, 0.07, 0.44, - 0.007, 0, 0.062, 0.027, 0.077, 0.068, 0.008, 0.034, 0.005, 0.02], - "Offset": -68.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.036, 0.009, 0.005, 0.045, 0.067, 0.044, 0.019, 0.063, 0.015, + 0.046, 0.001, 0.009, 0.03, 0.016, 0.004, 0.011, 0.088, 0.017, + 0.07, 0.023, 0.008, 0.081, 0.091, 0.046, 0.026, 0.06, 0.071], + "Offset": -514.0, "Multiplier": 0.001 }, { @@ -390,8 +339,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-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3", "VIRTUAL-SKIN-LINEAR-SUB-4", "VIRTUAL-SKIN-LINEAR-SUB-5"], - "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-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, @@ -834,8 +783,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.27, 0.06, 0.0, 0.0, 0.07, 0.0, 0.26, 0.21, 0.11], - "Offset": 530.0, + "Coefficient": [0.039, 0.001, 0.02, 0.107, 0.212, 0.2, 0.17, 0.05, 0.2], + "Offset": -428.0, "Multiplier": 0.001 }, { @@ -845,8 +794,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.27, 0.12, 0.0, 0.0, 0.01, 0.0, 0.13, 0.21, 0.2], - "Offset": 1530.0, + "Coefficient": [0.196, 0.009, 0.087, 0.046, 0.094, 0.007, 0.082, 0.302, 0.178], + "Offset": -2404.0, "Multiplier": 0.001 }, { @@ -856,19 +805,52 @@ "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.05, 0.0, 0.02, 0.01, 0.02, 0.19, 0.22, 0.19], - "Offset": 40.0, + "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231], + "Offset": -442.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.239, 0.019, 0.022, 0.059, 0.139, 0.015, 0.138, 0.203, 0.165], + "Offset": -442.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.334, 0.096, 0.021, 0.029, 0.028, 0.093, 0.165, 0.117, 0.116], + "Offset": -1119.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.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438], + "Offset": -2069.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "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-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient": [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", "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", 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, @@ -1080,10 +1062,6 @@ "Name": "VIRTUAL-SKIN-SUB-6", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, { "Name": "VIRTUAL-SKIN", "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 a32e9722..dbeb42ec 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -115,10 +115,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.244, 0.074, 0.016, 0.097, 0.192, 0.228, 0.012, 0.02, 0.074, 0.9], - "Offset": -911.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.286, 0.142, 0.033, 0.255, 0.012, 0.169, 0.062, 0.021, 0.02], + "Offset": -1373.0, "Multiplier": 0.001 }, { @@ -127,10 +126,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.065, 0.078, 0.025, 0.198, 0.09, 0.212, 0.239, 0.032, 0.107, 0.9], - "Offset": -1549.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191], + "Offset": -2299.0, "Multiplier": 0.001 }, { @@ -139,70 +137,9 @@ "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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.148, 0.063, 0.005, 0.187, 0.169, 0.181, 0.116, 0.02, 0.079, 1.02], - "Offset": 567.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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.042, 0.062, 0.053, 0.236, 0.048, 0.232, 0.203, 0.017, 0.208, 0.18], - "Offset": -3032.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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.096, 0.007, 0.069, 0.188, 0.033, 0.13, 0.174, 0.001, 0.16, 2.86], - "Offset": 4026.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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.185, 0.126, 0.076, 0.048, 0.087, 0.283, 0.016, 0.015, 0.159, 0.12], - "Offset": -2468.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.031, 0.081, 0.002, 0.164, 0.016, 0.079, 0.179, 0.218, 0.218, 0.38], - "Offset": 83.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-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", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.072, 0.022, 0.028, 0.305, 0.016, 0.124, 0.172, 0.068, 0.189, 0.04], - "Offset": 154.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.044, 0.041, 0.013, 0.307, 0.074, 0.059, 0.209, 0.062, 0.274], + "Offset": -2328.0, "Multiplier": 0.001 }, { @@ -211,8 +148,8 @@ "Version":"7.1", "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"], - "Coefficient": [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"], + "Coefficient": [1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -294,12 +231,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.022, 0.027, 0.004, 0.004, 0.017, 0.069, 0.026, 0.022, 0.013, 0.06, - 0.034, 0.061, 0.019, 0.014, 0.066, 0.043, 0.018, 0.056, 0.014, 0.4, - 0.03, 0.068, 0.068, 0.01, 0.066, 0.064, 0.062, 0.06, 0.064, 0.56], - "Offset": -1939.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.038, 0.015, 0.005, 0.044, 0.04, 0.035, 0.069, 0.007, 0.037, + 0.077, 0.016, 0.01, 0.003, 0.033, 0.02, 0.042, 0.002, 0.053, + 0.06, 0.088, 0.007, 0.058, 0.062, 0.086, 0.041, 0.011, 0.067], + "Offset": -1117.0, "Multiplier": 0.001 }, { @@ -308,12 +244,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.025, 0.015, 0.057, 0.025, 0.013, 0.006, 0.054, 0.062, 0.072, 0.24, - 0.059, 0.054, 0.043, 0.072, 0.013, 0.02, 0.016, 0.062, 0.042, 0.2, - 0.002, 0.052, 0.005, 0.001, 0.016, 0.06, 0.051, 0.069, 0.028, 0.22], - "Offset": -1527.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.003, 0.03, 0.015, 0.087, 0.087, 0.002, 0.01, 0.018, 0.09, + 0.071, 0.032, 0.004, 0.078, 0.009, 0.029, 0.064, 0.017, 0.049, + 0.068, 0.06, 0.017, 0.073, 0.029, 0.025, 0.057, 0.026, 0.014], + "Offset": -2136.0, "Multiplier": 0.001 }, { @@ -322,26 +257,11 @@ "Hidden": true, "VirtualSensor": true, "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.06, 0.068, 0.002, 0.043, 0.024, 0.052, 0.069, 0.006, 0.057, 0.3, - 0.008, 0.047, 0.001, 0.045, 0.07, 0.006, 0.003, 0.05, 0.031, 0.1, - 0.008, 0.072, 0.041, 0.016, 0.048, 0.023, 0.072, 0.035, 0.009, 0.22], - "Offset": 33.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "USE_LINEAR_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"], - "Coefficient": [0.018, 0.07, 0.048, 0.055, 0.081, 0.077, 0.051, 0.008, 0.03, 0.3, - 0.02, 0.052, 0.021, 0.028, 0.006, 0.012, 0.028, 0.048, 0.045, 0.12, - 0.023, 0.029, 0.083, 0.012, 0.085, 0.018, 0.03, 0.004, 0.064, 0.02], - "Offset": -2210.0, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.004, 0.033, 0.041, 0.039, 0.003, 0.017, 0.049, 0.02, 0.052, + 0.071, 0.007, 0.012, 0.057, 0.064, 0.008, 0.045, 0.0, 0.069, + 0.066, 0.052, 0.02, 0.041, 0.047, 0.067, 0.036, 0.011, 0.068], + "Offset": -119.0, "Multiplier": 0.001 }, { @@ -351,8 +271,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-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3"], - "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2"], + "Coefficient": [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, @@ -817,19 +737,74 @@ "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.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09], - "Offset": -1200.0, + "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191], + "Offset": -2299.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.11, 0.026, 0.137, 0.254, 0.148, 0.246, 0.008, 0.0, 0.071], + "Offset": -1249.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.128, 0.0, 0.019, 0.181, 0.069, 0.107, 0.121, 0.027, 0.347], + "Offset": -69.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.368, 0.012, 0.047, 0.01, 0.011, 0.358, 0.072, 0.034, 0.089], + "Offset": -4638.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.003, 0.03, 0.003, 0.262, 0.008, 0.292, 0.041, 0.217, 0.144], + "Offset": -1952.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.196, 0.153, 0.006, 0.166, 0.215, 0.18, 0.023, 0.026, 0.035], + "Offset": -2083.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "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-CHARGE-SUB-0"], - "Coefficient": [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", 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, @@ -1021,26 +996,6 @@ "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] - }, - { - "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] - }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, { "Name": "VIRTUAL-SKIN", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]