diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index 40bac51..c33479d 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -55,9 +55,14 @@ "Multiplier":0.001 }, { - "Name":"inner-disp", + "Name":"VIRTUAL-SKIN-OUTER-INNER", "Type":"UNKNOWN", - "Multiplier":1 + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["outer_disp_therm", "inner_disp_therm"], + "Coefficient":[2.5, -1.0], + "Multiplier":0.001 }, { "Name":"IS_OPEN", @@ -65,8 +70,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[-40000.0], "Multiplier":1 }, { @@ -75,8 +80,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[-1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[40000.0], "Multiplier":1 }, { diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index aa4a99d..ba8ba8c 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -61,9 +61,14 @@ "Multiplier":0.001 }, { - "Name":"inner-disp", + "Name":"VIRTUAL-SKIN-OUTER-INNER", "Type":"UNKNOWN", - "Multiplier":1 + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["outer_disp_therm", "inner_disp_therm"], + "Coefficient":[2.5, -1.0], + "Multiplier":0.001 }, { "Name":"IS_OPEN", @@ -71,8 +76,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[-40000.0], "Multiplier":1 }, { @@ -81,8 +86,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[-1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[40000.0], "Multiplier":1 }, { diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 2bc07a2..6592877 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -61,9 +61,14 @@ "Multiplier":0.001 }, { - "Name":"inner-disp", + "Name":"VIRTUAL-SKIN-OUTER-INNER", "Type":"UNKNOWN", - "Multiplier":1 + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["outer_disp_therm", "inner_disp_therm"], + "Coefficient":[2.5, -1.0], + "Multiplier":0.001 }, { "Name":"IS_OPEN", @@ -71,8 +76,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[-40000.0], "Multiplier":1 }, { @@ -81,8 +86,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["inner-disp"], - "Coefficient":[-1.0], + "Combination":["VIRTUAL-SKIN-OUTER-INNER"], + "Coefficient":[40000.0], "Multiplier":1 }, {