From 8d517a9b496edba41c7115c24543aa5df0408ab3 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 28 May 2024 20:45:10 +0800 Subject: [PATCH] thermal: Update vskin-speaker model - Use dvt data to train the model - Fall back to vskin-speaker-legacy: - if all samples not collected - if vskin-speaker-model temp < 20degC - if vskin-speaker-model temp >= 57degC - Add timeResolution to avoid duplicate readings issue. Bug: 343157242 Test: Push config and tflite model to verify lshal and logcat Change-Id: I2140a92ae3b19825ec9542e3ec65a365bec2e66f --- thermal/thermal_info_config_comet.json | 42 +++++++++++++++--- .../vt_speaker_estimation_model_comet.tflite | Bin 5684 -> 6382 bytes 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 73f1620..1e5702d 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -899,7 +899,8 @@ "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"], "Multiplier": 0.001, "PreviousSampleCount": 3, - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-SPEAKER-LEGACY", + "TimeResolution": 7000 }, { "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF", @@ -911,15 +912,46 @@ "Coefficient": [1.0, -1.0], "Multiplier": 1 }, + { + "Name": "IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-MODEL"], + "Coefficient":[20000, -57000], + "Multiplier":1 + }, + { + "Name":"IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, { "Name": "VIRTUAL-SKIN-SPEAKER", "Type": "UNKNOWN", - "Version": "1.0", + "Version": "2.0", "VirtualSensor": true, "TriggerSensor": "usb_conn_therm", - "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL"], - "Coefficient": [1.0], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY"], + "Coefficient": ["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", "NO_VSKIN_SPEAKER_MODEL_WITHIN_RANGE"], + "CoefficientType": ["SENSOR", "SENSOR"], "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 0.001, diff --git a/thermal/vt_speaker_estimation_model_comet.tflite b/thermal/vt_speaker_estimation_model_comet.tflite index b24da7b6daaea7991a93fc483eeabe970724cf78..65d0b74be0c4b082c8873bb33700f0b5da20d516 100644 GIT binary patch delta 3060 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 DAjzwE