diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json index ecb6d32..d6dc4bd 100644 --- a/thermal_info_config_husky.json +++ b/thermal_info_config_husky.json @@ -155,58 +155,91 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-CAM-QUIET", + "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["cam_therm", "quiet_therm"], - "Coefficient":[1.04, -0.04], - "Offset":-770, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.12, 0.11, 0.23, 0.04, 0.11, 0.11, 0.11, 0.11, 0.03], + "Offset":0, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NORTH-SOC", + "Name":"VIRTUAL-SKIN-SUB-1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm"], - "Coefficient":[0.850, 0.150], - "Offset":-1710, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0, 0, 0, 0.44, 0, 0.11, 0.27], + "Offset":4840, "Multiplier":0.001 }, { - "Name":"VIRTUAL-DISP-USB", + "Name":"VIRTUAL-SKIN-SUB-2", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["disp_therm", "usb_pwr_therm"], - "Coefficient":[0.720, 0.280], - "Offset":-1830, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.11, 0.10, 0, 0.11, 0.13, 0.11, 0.18, 0.1, 0.07], + "Offset":2540, "Multiplier":0.001 }, { - "Name":"VIRTUAL-DISP-NEUTRAL", + "Name":"VIRTUAL-SKIN-SUB-3", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["disp_therm", "neutral_therm"], - "Coefficient":[0.680, 0.320], - "Offset":-1900, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0, 0, 0.22, 0, 0.24, 0, 0.50], + "Offset":-6750, "Multiplier":0.001 }, { - "Name":"VIRTUAL-CHARGE-DISP", + "Name":"VIRTUAL-SKIN-SUB-4", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["charge_therm", "disp_therm"], - "Coefficient":[0.580, 0.420], - "Offset":-1390, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0.04, 0.54, 0, 0.3, 0.02, 0, 0], + "Offset":2090, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0.16, 0.46, 0.03, 0.21, 0.04, 0, 0], + "Offset":1200, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.17, 0.11, 0.11, 0.11, 0.13, 0.11, 0.11, 0.11, 0.21], + "Offset":-6920, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.58, 0.02, 0, 0.2, 0, 0, 0.03, 0.19, 0], + "Offset":-800, "Multiplier":0.001 }, { @@ -226,8 +259,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-CAM-QUIET", "VIRTUAL-NORTH-SOC", "VIRTUAL-DISP-USB", "VIRTUAL-DISP-NEUTRAL", "VIRTUAL-CHARGE-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -360,10 +393,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "TriggerSensor":"quiet_therm", - "Formula":"WEIGHTED_AVG", - "Combination":["soc_therm", "disp_therm"], - "Coefficient":[0.520, 0.480], - "Offset":-1990, + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json index e0122cd..02cb781 100644 --- a/thermal_info_config_shiba.json +++ b/thermal_info_config_shiba.json @@ -155,58 +155,113 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-CHARGE-DISP", + "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["charge_therm", "disp_therm"], - "Coefficient":[0.620, 0.380], - "Offset":-1150, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.08, 0, 0.17, 0.3, 0.46, 0, 0, 0, 0], + "Offset":-530, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NEUTRAL-NORTH", + "Name":"VIRTUAL-SKIN-SUB-1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "north_therm"], - "Coefficient":[0.620, 0.380], - "Offset":-1980, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.02, 0, 0, 0, 0, 0.22, 0.6, 0, 0], + "Offset":2900, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NORTH-SOC", + "Name":"VIRTUAL-SKIN-SUB-2", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm"], - "Coefficient":[0.720, 0.280], - "Offset":-1750, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.4, 0.1, 0, 0.11, 0.08, 0, 0.24, 0, 0.02], + "Offset":2580, "Multiplier":0.001 }, { - "Name":"VIRTUAL-NORTH-CHARGE", + "Name":"VIRTUAL-SKIN-SUB-3", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "charge_therm"], - "Coefficient":[0.620, 0.380], - "Offset":-910, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.45, 0.23, 0.29, 0, 0, 0.01, 0.0, 0, 0], + "Offset":-1580, "Multiplier":0.001 }, { - "Name":"VIRTUAL-QUIET-NEUTRAL", + "Name":"VIRTUAL-SKIN-SUB-4", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["quiet_therm", "neutral_therm"], - "Coefficient":[0.790, 0.210], - "Offset":-2000, + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.04, 0, 0.01, 0, 0.15, 0.34, 0, 0, 0.32], + "Offset":4230, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0.56, 0.31, 0, 0.08, 0.02, 0, 0], + "Offset":-5640, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-6", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.4, 0.14, 0.17, 0, 0.32, 0, 0, 0, 0], + "Offset":-620, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SUB-7", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0, 0, 0.03, 0, 0.02, 0.06, 0, 0.72, 0.04], + "Offset":3960, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.29, 0, 0, 0.27, 0.49, 0.01, 0.06, 0, 0.05], + "Offset":-6650, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Coefficient":[0.21, 0.02, 0, 0.25, 0, 0.22, 0, 0.17, 0.08], + "Offset":1710, "Multiplier":0.001 }, { @@ -216,8 +271,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "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], + "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -350,10 +405,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "TriggerSensor":"quiet_therm", - "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "soc_therm"], - "Coefficient":[0.680, 0.320], - "Offset":-830, + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001,