diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index f9ca1c9e..229738e9 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -164,55 +164,6 @@ "Coefficient": [1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, - { - "Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "COUNT_THRESHOLD", - "Combination": ["VIRTUAL-SKIN-LEGACY"], - "Coefficient": [55000.0], - "Multiplier": 1.0 - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Type": "UNKNOWN", - "VirtualSensor": true, - "ModelPath": "vt_estimation_model.tflite", - "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"], - "Multiplier": 0.001, - "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", - "OffsetThresholds" : [50000, 53000], - "OffsetValues" : [500, 1000], - "ValidateInput": true - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, -1.0], - "Multiplier": 1 - }, - { - "Name": "STATS-UPDATOR", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], - "Multiplier": 1, - "SendPowerHint": true, - "PollingDelay": 300000, - "PassiveDelay": 7000 - }, { "Name": "VIRTUAL-SKIN", "Type": "SKIN", @@ -220,9 +171,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-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], - "CoefficientType":["CONSTANT", "SENSOR"], + "Combination": ["VIRTUAL-SKIN-LEGACY"], + "Coefficient": [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, @@ -240,106 +190,6 @@ } ] }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-0", - "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"], - "Coefficient": [0.19, 0.04, 0.0, 0.06, 0.0, 0.0, 0.07, 0.03, 0.16, - 0.01, 0.05, 0.07, 0.05, 0.0, 0.01, 0.0, 0.0, 0.02, - 0.05, 0.01, 0.0, 0.01, 0.0, 0.0, 0.06, 0.0, 0.05], - "OffsetThresholds" : [0.0], - "OffsetValues" : [2390.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-1", - "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"], - "Coefficient": [0.17, 0.06, 0.0, 0.03, 0.0, 0.02, 0.05, 0.03, 0.28, - 0.02, 0.04, 0.0, 0.0, 0.0, 0.0, 0.05, 0.03, 0.05, - 0.06, 0.0, 0.0, 0.01, 0.0, 0.0, 0.04, 0.02, 0.03], - "OffsetThresholds" : [0.0], - "OffsetValues" : [840.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"], - "Coefficient": [0.1, 0.04, 0.0, 0.0, 0.0, 0.0, 0.08, 0.03, 0.4, - 0.02, 0.0, 0.0, 0.0, 0.0, 0.06, 0.04, 0.0, 0.06, - 0.12, 0.0, 0.0, 0.0, 0.0, 0.01, 0.06, 0.0, 0.0], - "OffsetThresholds" : [0.0], - "OffsetValues" : [370.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"], - "Coefficient": [0.23, 0.04, 0.0, 0.01, 0.0, 0.0, 0.12, 0.04, 0.41, - 0.05, 0.02, 0.0, 0.0, 0.0, 0.0, 0.02, 0.05, 0.02, - 0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.05, 0.02, 0.06], - "OffsetThresholds" : [0.0], - "OffsetValues" : [-5250.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"], - "Coefficient": [0.0, 0.01, 0.0, 0.0, 0.0, 0.0, 0.07, 0.0, 0.26, - 0.04, 0.0, 0.0, 0.0, 0.0, 0.0, 0.01, 0.0, 0.06, - 0.26, 0.1, 0.0, 0.0, 0.0, 0.0, 0.01, 0.03, 0.15], - "OffsetThresholds" : [0.0], - "OffsetValues" : [530.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"], - "Coefficient": [0.19, 0.09, 0.03, 0.01, 0.0, 0.04, 0.08, 0.04, 0.02, - 0.02, 0.02, 0.06, 0.07, 0.0, 0.01, 0.05, 0.01, 0.04, - 0.03, 0.04, 0.01, 0.03, 0.0, 0.0, 0.04, 0.0, 0.08], - "OffsetThresholds" : [0.0], - "OffsetValues" : [-1070.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR", - "Type": "UNKNOWN", - "Version": "Patch_1.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-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], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -1014,83 +864,5 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ], - "Stats": { - "Sensors": { - "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], - "RecordWithThreshold": [ - { - "Name": "VIRTUAL-BTS-WINDOW-PARTIAL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SPEAKER", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-0", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-1", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "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", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-LEGACY", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-0.5", - "Thresholds": [ - -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, - 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 - ] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-1", - "Thresholds": [ - -13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000, - -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 - ] - } - ], - "Abnormality": { - "Outlier": { - "Configs": [ - { - "Monitor": ["VIRTUAL-SKIN-MODEL"], - "TempRange": [0.0, 55.0] - }, - { - "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-12000, 12000] - } - ] - } - } - }, - "CoolingDevices": { - "RecordVotePerSensor": { - "DefaultThresholdEnableAll": true - } - } - } + ] } diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index fad2e07f..b158aaa4 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -197,55 +197,6 @@ "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, - { - "Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "COUNT_THRESHOLD", - "Combination": ["VIRTUAL-SKIN-LEGACY"], - "Coefficient": [55000.0], - "Multiplier": 1.0 - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Type": "UNKNOWN", - "VirtualSensor": true, - "ModelPath": "vt_estimation_model.tflite", - "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"], - "Multiplier": 0.001, - "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", - "OffsetThresholds" : [50000, 53000], - "OffsetValues" : [500, 1000], - "ValidateInput": true - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, -1.0], - "Multiplier": 1 - }, - { - "Name": "STATS-UPDATOR", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], - "Multiplier": 1, - "SendPowerHint": true, - "PollingDelay": 300000, - "PassiveDelay": 7000 - }, { "Name": "VIRTUAL-SKIN", "Type": "SKIN", @@ -253,9 +204,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-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], - "CoefficientType":["CONSTANT", "SENSOR"], + "Combination": ["VIRTUAL-SKIN-LEGACY"], + "Coefficient": [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, @@ -273,92 +223,6 @@ } ] }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-0", - "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"], - "Coefficient": [0.02, 0.0, 0.0, 0.05, 0.0, 0.0, 0.05, 0.01, 0.04, - 0.0, 0.0, 0.01, 0.01, 0.0, 0.0, 0.01, 0.0, 0.0, - 0.31, 0.03, 0.0, 0.05, 0.0, 0.0, 0.0, 0.25, 0.08], - "OffsetThresholds" : [0.0], - "OffsetValues" : [2660.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-1", - "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"], - "Coefficient": [0.19, 0.06, 0.0, 0.01, 0.0, 0.0, 0.07, 0.1, 0.09, - 0.02, 0.03, 0.0, 0.0, 0.05, 0.0, 0.04, 0.03, 0.01, - 0.05, 0.01, 0.0, 0.0, 0.01, 0.0, 0.03, 0.07, 0.04], - "OffsetThresholds" : [0.0], - "OffsetValues" : [2860.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"], - "Coefficient": [0.21, 0.02, 0.0, 0.44, 0.0, 0.0, 0.0, 0.12, 0.0, - 0.04, 0.0, 0.0, 0.03, 0.0, 0.0, 0.0, 0.04, 0.0, - 0.01, 0.0, 0.0, 0.01, 0.0, 0.0, 0.0, 0.05, 0.0], - "OffsetThresholds" : [0.0], - "OffsetValues" : [1330.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"], - "Coefficient": [0.07, 0.03, 0.0, 0.05, 0.0, 0.0, 0.07, 0.1, 0.03, - 0.11, 0.0, 0.0, 0.06, 0.0, 0.02, 0.05, 0.07, 0.05, - 0.07, 0.0, 0.0, 0.04, 0.0, 0.02, 0.05, 0.03, 0.03], - "OffsetThresholds" : [0.0], - "OffsetValues" : [2070.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"], - "Coefficient": [0.18, 0.0, 0.0, 0.03, 0.1, 0.04, 0.09, 0.13, 0.05, - 0.07, 0.0, 0.0, 0.0, 0.06, 0.0, 0.02, 0.05, 0.07, - 0.01, 0.0, 0.0, 0.0, 0.01, 0.0, 0.0, 0.02, 0.07], - "OffsetThresholds" : [0.0], - "OffsetValues" : [10.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR", - "Type": "UNKNOWN", - "Version": "Patch_1.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-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3", "VIRTUAL-SKIN-LINEAR-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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -1101,95 +965,5 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ], - "Stats": { - "Sensors": { - "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], - "RecordWithThreshold": [ - { - "Name": "VIRTUAL-BTS-WINDOW-PARTIAL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SPEAKER", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-0", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-1", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "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", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-LEGACY", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-0.5", - "Thresholds": [ - -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, - 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 - ] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-1", - "Thresholds": [ - -13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000, - -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 - ] - } - ], - "Abnormality": { - "Outlier": { - "Configs": [ - { - "Monitor": ["VIRTUAL-SKIN-MODEL"], - "TempRange": [0.0, 55.0] - }, - { - "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-12000, 12000] - } - ] - } - } - }, - "CoolingDevices": { - "RecordVotePerSensor": { - "DefaultThresholdEnableAll": true - } - } - } + ] } diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 62446c9d..2764fafb 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -143,55 +143,6 @@ "Coefficient": [1.0, 1.0, 1.0], "Multiplier": 0.001 }, - { - "Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "COUNT_THRESHOLD", - "Combination": ["VIRTUAL-SKIN-LEGACY"], - "Coefficient": [55000.0], - "Multiplier": 1.0 - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Type": "UNKNOWN", - "VirtualSensor": true, - "ModelPath": "vt_estimation_model.tflite", - "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], - "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"], - "Multiplier": 0.001, - "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", - "OffsetThresholds" : [50000, 53000], - "OffsetValues" : [500, 1000], - "ValidateInput": true - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, -1.0], - "Multiplier": 1 - }, - { - "Name": "STATS-UPDATOR", - "Type": "UNKNOWN", - "VirtualSensor": true, - "Hidden": true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], - "Multiplier": 1, - "SendPowerHint": true, - "PollingDelay": 300000, - "PassiveDelay": 7000 - }, { "Name": "VIRTUAL-SKIN", "Type": "SKIN", @@ -199,9 +150,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-MODEL", "VIRTUAL-SKIN-LEGACY"], - "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], - "CoefficientType":["CONSTANT", "SENSOR"], + "Combination": ["VIRTUAL-SKIN-LEGACY"], + "Coefficient": [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, @@ -219,78 +169,6 @@ } ] }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-0", - "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"], - "Coefficient": [0.08, 0.0, 0.0, 0.01, 0.0, 0.16, 0.17, 0.0, 0.22, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.07, 0.04, 0.0, 0.13, - 0.02, 0.0, 0.0, 0.01, 0.0, 0.0, 0.03, 0.0, 0.09], - "OffsetThresholds" : [0.0], - "OffsetValues" : [1020.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR-SUB-1", - "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"], - "Coefficient": [0.03, 0.03, 0.0, 0.18, 0.02, 0.07, 0.08, 0.0, 0.12, - 0.01, 0.05, 0.0, 0.09, 0.04, 0.04, 0.0, 0.0, 0.07, - 0.01, 0.06, 0.0, 0.04, 0.01, 0.0, 0.05, 0.0, 0.04], - "OffsetThresholds" : [0.0], - "OffsetValues" : [-80.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"], - "Coefficient": [0.01, 0.0, 0.0, 0.09, 0.0, 0.08, 0.02, 0.0, 0.04, - 0.02, 0.0, 0.0, 0.06, 0.0, 0.06, 0.02, 0.0, 0.02, - 0.1, 0.0, 0.0, 0.28, 0.0, 0.11, 0.03, 0.0, 0.04], - "OffsetThresholds" : [0.0], - "OffsetValues" : [2230.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"], - "Coefficient": [0.1, 0.0, 0.0, 0.06, 0.0, 0.03, 0.31, 0.0, 0.1, - 0.05, 0.0, 0.0, 0.05, 0.0, 0.06, 0.0, 0.0, 0.01, - 0.06, 0.01, 0.0, 0.02, 0.0, 0.07, 0.03, 0.0, 0.09], - "OffsetThresholds" : [0.0], - "OffsetValues" : [-390.0], - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-LINEAR", - "Type": "UNKNOWN", - "Version": "Patch_1.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-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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -1009,75 +887,5 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ], - "Stats": { - "Sensors": { - "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], - "RecordWithThreshold": [ - { - "Name": "VIRTUAL-SKIN-SPEAKER", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-0", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-1", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-SUB-2", - "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] - }, - { - "Name": "VIRTUAL-SKIN-LEGACY", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-0.5", - "Thresholds": [ - -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, - 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 - ] - }, - { - "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", - "LoggingName": "MODEL-LEGACY-1", - "Thresholds": [ - -13000, -12000, -11000, -10000, -9000, -8000, -7000, -6000, -5000, - -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 - ] - } - ], - "Abnormality": { - "Outlier": { - "Configs": [ - { - "Monitor": ["VIRTUAL-SKIN-MODEL"], - "TempRange": [0.0, 55.0] - }, - { - "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-12000, 12000] - } - ] - } - } - }, - "CoolingDevices": { - "RecordVotePerSensor": { - "DefaultThresholdEnableAll": true - } - } - } + ] }