diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index a88aa37..18181bc 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -150,19 +150,19 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-QI-USB", + "Name":"VIRTUAL-GNSS-DISP", "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ - "qi_therm", - "usb_pwr_therm" + "gnss_tcxo_therm", + "disp_therm" ], "Coefficient":[ - "0.650", - "0.350" + "0.5", + "0.5" ], - "Offset":-1300, + "Offset":-200, "HotThreshold":[ "NAN", "NAN", @@ -237,10 +237,36 @@ "quiet_therm" ], "Coefficient":[ - "0.760", - "0.240" + "0.650", + "0.350" ], - "Offset":-2100, + "Offset":-1700, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-USB", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "usb_pwr_therm" + ], + "Coefficient":[ + "0.460", + "0.540" + ], + "Offset":-3200, "HotThreshold":[ "NAN", "NAN", @@ -260,7 +286,7 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-QI-USB", + "VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2" ], @@ -327,9 +353,11 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-NEUTRAL-QUIET" + "VIRTUAL-NEUTRAL-QUIET", + "VIRTUAL-NEUTRAL-USB" ], "Coefficient":[ + "1.0", "1.0" ], "HotThreshold":[ @@ -392,7 +420,7 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-QI-USB", + "VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2" ], diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index ef853f2..2d18aaf 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -162,7 +162,7 @@ "0.680", "0.320" ], - "Offset":-2200, + "Offset":-2800, "HotThreshold":[ "NAN", "NAN", @@ -185,10 +185,10 @@ "quiet_therm" ], "Coefficient":[ - "0.6", - "0.4" + "0.52", + "0.48" ], - "Offset":-2900, + "Offset":-500, "HotThreshold":[ "NAN", "NAN", @@ -202,19 +202,19 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-GNSS-USB2", + "Name":"VIRTUAL-GNSS-DISP", "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ "gnss_tcxo_therm", - "usb_pwr_therm2" + "disp_therm" ], "Coefficient":[ - "0.668", - "0.332" + "0.7", + "0.3" ], - "Offset":-1557, + "Offset":-500, "HotThreshold":[ "NAN", "NAN", @@ -237,10 +237,10 @@ "quiet_therm" ], "Coefficient":[ - "0.675", - "0.325" + "0.4", + "0.6" ], - "Offset":-1900, + "Offset":-1500, "HotThreshold":[ "NAN", "NAN", @@ -263,10 +263,10 @@ "usb_pwr_therm" ], "Coefficient":[ - "0.734", - "0.266" + "0.6", + "0.4" ], - "Offset":-2271, + "Offset":-4000, "HotThreshold":[ "NAN", "NAN", @@ -288,7 +288,7 @@ "Combination":[ "VIRTUAL-QI-USB", "VIRTUAL-USB-QUIET", - "VIRTUAL-GNSS-USB2" + "VIRTUAL-GNSS-DISP" ], "Coefficient":[ "1.0", @@ -422,7 +422,7 @@ "Combination":[ "VIRTUAL-QI-USB", "VIRTUAL-USB-QUIET", - "VIRTUAL-GNSS-USB2" + "VIRTUAL-GNSS-DISP" ], "Coefficient":[ "1.0",