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