diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json index 7ad2909..23457f3 100644 --- a/thermal_info_config_husky.json +++ b/thermal_info_config_husky.json @@ -61,6 +61,61 @@ "PollingDelay":60000, "PassiveDelay":7000 }, + { + "Name":"VIRTUAL-CHARGE-CAM", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["charge_therm", "cam_therm"], + "Coefficient":[0.540, 0.460], + "Offset":-2000, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-DISP-USB", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["disp_therm", "usb_pwr_therm"], + "Coefficient":[0.710, 0.290], + "Offset":-1580, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-CAM-SOC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["cam_therm", "soc_therm"], + "Coefficient":[0.850, 0.150], + "Offset":-1640, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NORTH-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "charge_therm"], + "Coefficient":[0.550, 0.450], + "Offset":-1970, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-DISP-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["disp_therm", "neutral_therm"], + "Coefficient":[0.780, 0.220], + "Offset":-1960, + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", @@ -68,8 +123,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -86,8 +141,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -102,8 +157,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -136,8 +191,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,9 +214,9 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"WEIGHTED_AVG", - "Combination":["charge_therm", "quiet_therm"], - "Coefficient":[0.282, 0.718], - "Offset":-448, + "Combination":["soc_therm", "disp_therm"], + "Coefficient":[0.520, 0.480], + "Offset":-1990, "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -181,8 +236,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json index 7ad2909..05c44cf 100644 --- a/thermal_info_config_shiba.json +++ b/thermal_info_config_shiba.json @@ -61,6 +61,61 @@ "PollingDelay":60000, "PassiveDelay":7000 }, + { + "Name":"VIRTUAL-CHARGE-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["charge_therm", "disp_therm"], + "Coefficient":[0.620, 0.380], + "Offset":-1150, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-NORTH", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "north_therm"], + "Coefficient":[0.620, 0.380], + "Offset":-1980, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NORTH-SOC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "soc_therm"], + "Coefficient":[0.720, 0.280], + "Offset":-1750, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NORTH-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "charge_therm"], + "Coefficient":[0.620, 0.380], + "Offset":-910, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["quiet_therm", "neutral_therm"], + "Coefficient":[0.790, 0.210], + "Offset":-2000, + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", @@ -68,8 +123,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -86,8 +141,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -102,8 +157,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -136,8 +191,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,9 +214,9 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"WEIGHTED_AVG", - "Combination":["charge_therm", "quiet_therm"], - "Coefficient":[0.282, 0.718], - "Offset":-448, + "Combination":["neutral_therm", "soc_therm"], + "Coefficient":[0.680, 0.320], + "Offset":-830, "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -181,8 +236,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001,