diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 80ea9670..2268b2bc 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -175,20 +175,70 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", "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", + "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"], "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, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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", + "Version": "2.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -200,22 +250,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -864,10 +898,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -887,8 +917,50 @@ { "Name": "VIRTUAL-SKIN-SUB-4", "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": { diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 81d92b9e..50e07004 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -164,21 +164,69 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", - "Version":"2.0", - "VirtualSensor":true, + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", + "VirtualSensor": true, + "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], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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":"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], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], - "Multiplier":0.001, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "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", + "Version": "2.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -190,22 +238,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -645,7 +677,6 @@ "Offset": 3300.0, "Multiplier": 0.001 }, - { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", @@ -889,10 +920,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -908,8 +935,50 @@ { "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": { diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index aea23e94..9e793ba2 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -164,20 +164,70 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", "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", + "VirtualSensor": true, + "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], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], - "Multiplier":0.001, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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", + "Version": "6.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -189,22 +239,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -853,10 +887,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -872,8 +902,50 @@ { "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": { diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index f53e3caa..27ce444d 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -197,21 +197,69 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", - "Version":"6.0", - "VirtualSensor":true, + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", + "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"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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":"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, 1, 1, 1, 1, 1, 1], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], - "Multiplier":0.001, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "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", + "Version": "6.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -223,22 +271,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -989,10 +1021,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -1020,8 +1048,50 @@ { "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": { diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index f62361fc..46af886d 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -154,20 +154,70 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", "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", + "VirtualSensor": true, + "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], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], - "Multiplier":0.001, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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", + "Version": "6.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -179,22 +229,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -839,10 +873,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -858,8 +888,50 @@ { "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": { diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 0353b53c..f877fd8e 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -143,20 +143,69 @@ "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN", - "Type":"SKIN", - "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", + "Name": "VIRTUAL-SKIN-LEGACY", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"], - "Coefficient": [1, 1, 1], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], - "Multiplier":0.001, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000, + "Coefficient": [1.0, 1.0, 1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_estimation_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [1.0], + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "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", + "Version": "6.1", + "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-LEGACY"], + "Coefficient": [1], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -168,22 +217,6 @@ } ] }, - { - "Name":"VIRTUAL-SKIN-MODEL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "ModelPath":"vt_estimation_model.tflite", - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Formula":"USE_ML_MODEL", - "Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"], - "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, - "SendPowerHint":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", @@ -906,10 +939,6 @@ "Name": "VIRTUAL-SKIN-SPEAKER", "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-SUB-0", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] @@ -921,8 +950,50 @@ { "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": {