diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 54949e4d..fef432b6 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -171,10 +171,12 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -237,7 +239,8 @@ "Coefficient": [0.073, 0.001, 0.029, 0.08, 0.072, 0.034, 0.004, 0.036, 0.04, 0.055, 0.002, 0.029, 0.061, 0.072, 0.011, 0.04, 0.027, 0.072, 0.071, 0.003, 0.026, 0.03, 0.04, 0.015, 0.001, 0.035, 0.042], - "Offset": -490.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-490.0], "Multiplier": 0.001 }, { @@ -250,7 +253,8 @@ "Coefficient": [0.077, 0.089, 0.003, 0.077, 0.002, 0.021, 0.07, 0.035, 0.044, 0.094, 0.001, 0.001, 0.001, 0.084, 0.034, 0.022, 0.081, 0.026, 0.083, 0.022, 0.012, 0.051, 0.017, 0.021, 0.003, 0.024, 0.009], - "Offset": -961.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-961.0], "Multiplier": 0.001 }, { @@ -263,7 +267,8 @@ "Coefficient": [0.094, 0.007, 0.011, 0.032, 0.001, 0.091, 0.085, 0.045, 0.002, 0.054, 0.0, 0.019, 0.01, 0.065, 0.012, 0.03, 0.022, 0.076, 0.062, 0.019, 0.007, 0.025, 0.071, 0.005, 0.081, 0.015, 0.058], - "Offset": -440.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-440.0], "Multiplier": 0.001 }, { diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 59ee53fe..f9ca1c9e 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -182,9 +182,12 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -247,7 +250,8 @@ "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], - "Offset": 2390.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [2390.0], "Multiplier": 0.001 }, { @@ -260,7 +264,8 @@ "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], - "Offset": 840.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [840.0], "Multiplier": 0.001 }, { @@ -273,7 +278,8 @@ "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], - "Offset": 370.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [370.0], "Multiplier": 0.001 }, { @@ -286,7 +292,8 @@ "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], - "Offset": -5250.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [-5250.0], "Multiplier": 0.001 }, { @@ -299,7 +306,8 @@ "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], - "Offset": 530.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [530.0], "Multiplier": 0.001 }, { @@ -312,7 +320,8 @@ "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], - "Offset": -1070.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [-1070.0], "Multiplier": 0.001 }, { diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 8c1a0cca..dba36b7f 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -193,11 +193,13 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, "Offset": 500, - "PreviousSampleCount": 3 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -260,7 +262,8 @@ "Coefficient": [0.1, 0.055, 0.004, 0.027, 0.062, 0.025, 0.04, 0.05, 0.037, 0.077, 0.001, 0.007, 0.015, 0.025, 0.016, 0.019, 0.09, 0.045, 0.072, 0.044, 0.015, 0.029, 0.043, 0.001, 0.002, 0.059, 0.039], - "Offset": -168.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-168.0], "Multiplier": 0.001 }, { @@ -273,7 +276,8 @@ "Coefficient": [0.046, 0.006, 0.012, 0.033, 0.068, 0.029, 0.033, 0.061, 0.047, 0.039, 0.042, 0.005, 0.031, 0.05, 0.008, 0.024, 0.014, 0.044, 0.054, 0.029, 0.003, 0.068, 0.067, 0.028, 0.066, 0.039, 0.055], - "Offset": -76.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-76.0], "Multiplier": 0.001 }, { diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 41c1a739..fad2e07f 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -215,10 +215,12 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, - "Offset": 500, - "PreviousSampleCount": 3 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -281,7 +283,8 @@ "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], - "Offset": 2660.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [2660.0], "Multiplier": 0.001 }, { @@ -294,7 +297,8 @@ "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], - "Offset": 2860.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [2860.0], "Multiplier": 0.001 }, { @@ -307,7 +311,8 @@ "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], - "Offset": 1330.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [1330.0], "Multiplier": 0.001 }, { @@ -320,7 +325,8 @@ "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], - "Offset": 2070.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [2070.0], "Multiplier": 0.001 }, { @@ -333,7 +339,8 @@ "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], - "Offset": 10.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [10.0], "Multiplier": 0.001 }, { diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 85304155..ede898a2 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -161,10 +161,12 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -228,6 +230,8 @@ 0.061, 0.034, 0.034, 0.067, 0.046, 0.068, 0.033, 0.001, 0.079, 0.043, 0.006, 0.005, 0.026, 0.033, 0.015, 0.062, 0.009, 0.03], "Offset": -1087.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-1087.0], "Multiplier": 0.001 }, { @@ -241,6 +245,8 @@ 0.023, 0.049, 0.018, 0.082, 0.008, 0.066, 0.065, 0.02, 0.006, 0.048, 0.033, 0.009, 0.085, 0.018, 0.019, 0.05, 0.005, 0.073], "Offset": -127.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-127.0], "Multiplier": 0.001 }, { @@ -253,7 +259,8 @@ "Coefficient": [0.067, 0.036, 0.02, 0.001, 0.02, 0.041, 0.011, 0.0, 0.08, 0.054, 0.041, 0.017, 0.019, 0.041, 0.074, 0.069, 0.004, 0.044, 0.077, 0.006, 0.012, 0.077, 0.043, 0.071, 0.055, 0.011, 0.009], - "Offset": -333.0, + "OffsetThresholds": [0.0], + "OffsetValues": [-333.0], "Multiplier": 0.001 }, { diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 47d95a46..62446c9d 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -161,9 +161,12 @@ "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"], - "Coefficient": [1.0], "Multiplier": 0.001, - "PreviousSampleCount": 5 + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "OffsetThresholds" : [50000, 53000], + "OffsetValues" : [500, 1000], + "ValidateInput": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -226,7 +229,8 @@ "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], - "Offset": 1020.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [1020.0], "Multiplier": 0.001 }, { @@ -239,7 +243,8 @@ "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], - "Offset": -80.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [-80.0], "Multiplier": 0.001 }, { @@ -252,7 +257,8 @@ "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], - "Offset": 2230.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [2230.0], "Multiplier": 0.001 }, { @@ -265,7 +271,8 @@ "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], - "Offset": -390.0, + "OffsetThresholds" : [0.0], + "OffsetValues" : [-390.0], "Multiplier": 0.001 }, { diff --git a/thermal/vt_estimation_model_caiman.tflite b/thermal/vt_estimation_model_caiman.tflite index c7b2b293..fbeb3faa 100644 Binary files a/thermal/vt_estimation_model_caiman.tflite and b/thermal/vt_estimation_model_caiman.tflite differ diff --git a/thermal/vt_estimation_model_komodo.tflite b/thermal/vt_estimation_model_komodo.tflite index 0792305d..8dce026b 100644 Binary files a/thermal/vt_estimation_model_komodo.tflite and b/thermal/vt_estimation_model_komodo.tflite differ diff --git a/thermal/vt_estimation_model_tokay.tflite b/thermal/vt_estimation_model_tokay.tflite index 34995f5c..b9488fe9 100644 Binary files a/thermal/vt_estimation_model_tokay.tflite and b/thermal/vt_estimation_model_tokay.tflite differ