thermal: add smooth transition from model to legacy vt

- Remove backup sensor and enable under sampling
- Clamp VT_MODEL prediction based on training set max_surface
- Use VT_MODEL_LEGACY_DIFF to decide on switch
- Enable smooth transition with weights

Bug: 336265406
Test: Build and boot on device. Test smooth transition

Change-Id: If30a87a24b12b0af5527d9c05be7a14bb06dcfac
Signed-off-by: Sayanna Chandula <sayanna@google.com>

thermal/thermal_info_config_caiman.json

@@ -173,10 +173,31 @@
             "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
             "Multiplier": 0.001,
             "PreviousSampleCount": 3,
-            "BackupSensor" : "VIRTUAL-SKIN-LEGACY",
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "ValidateInput": true
+            "SupportUnderStampling": true
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MINIMUM",
+            "Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MAXIMUM",
+            "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -188,6 +209,50 @@
             "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
+        {
+            "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VT_LEGACY_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "COUNT_THRESHOLD",
+            "StepRatio": 0.2,
+            "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
+            "Coefficient": [7000, 7000],
+            "Multiplier": 1,
+            "PassiveDelay": 7000
+        },
+        {
+            "Name": "VT_MODEL_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["1", "VT_LEGACY_WEIGHT"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPDATED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
+            "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 1
+        },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
             "Type": "UNKNOWN",
@@ -222,7 +287,7 @@
             "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"],
+            "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
             "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
             "CoefficientType":["CONSTANT", "SENSOR"],
             "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

thermal/thermal_info_config_komodo.json

@@ -196,10 +196,31 @@
             "Multiplier": 0.001,
             "Offset": 500,
             "PreviousSampleCount": 3,
-            "BackupSensor" : "VIRTUAL-SKIN-LEGACY",
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "ValidateInput": true
+            "SupportUnderSampling": true
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MINIMUM",
+            "Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MAXIMUM",
+            "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -211,6 +232,50 @@
             "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
+        {
+            "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VT_LEGACY_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "COUNT_THRESHOLD",
+            "StepRatio": 0.2,
+            "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
+            "Coefficient": [7000, 7000],
+            "Multiplier": 1,
+            "PassiveDelay": 7000
+        },
+        {
+            "Name": "VT_MODEL_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["1", "VT_LEGACY_WEIGHT"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPDATED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
+            "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 1
+        },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
             "Type": "UNKNOWN",
@@ -245,7 +310,7 @@
             "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"],
+            "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
             "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
             "CoefficientType":["CONSTANT", "SENSOR"],
             "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

thermal/thermal_info_config_tokay.json

@@ -163,10 +163,31 @@
             "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
             "Multiplier": 0.001,
             "PreviousSampleCount": 3,
-            "BackupSensor" : "VIRTUAL-SKIN-LEGACY",
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "ValidateInput": true
+            "SupportUnderSampling": true
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MINIMUM",
+            "Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "MAXIMUM",
+            "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, 1.0],
+            "Multiplier": 1
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -178,6 +199,50 @@
             "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
+        {
+            "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VT_LEGACY_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "COUNT_THRESHOLD",
+            "StepRatio": 0.2,
+            "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
+            "Coefficient": [7000, 7000],
+            "Multiplier": 1,
+            "PassiveDelay": 7000
+        },
+        {
+            "Name": "VT_MODEL_WEIGHT",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["1", "VT_LEGACY_WEIGHT"],
+            "CombinationType": ["CONSTANT", "SENSOR"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-MODEL-UPDATED",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
+            "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 1
+        },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
             "Type": "UNKNOWN",
@@ -212,7 +277,7 @@
             "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"],
+            "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
             "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
             "CoefficientType":["CONSTANT", "SENSOR"],
             "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],