Merge "thermal: update the VSKIN equation V06" into udc-dev
This commit is contained in:
commit
cc026d8a81
3 changed files with 24 additions and 87 deletions
|
@ -79,36 +79,15 @@
|
||||||
"Coefficient":[-1.0],
|
"Coefficient":[-1.0],
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1-RAW",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
|
|
||||||
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
|
|
||||||
"Offset":-670,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"MINIMUM",
|
|
||||||
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
|
||||||
"Coefficient":[1.0, 49000.0],
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
|
"Coefficient":[0.259, 0.652, -0.161, 0.03],
|
||||||
"Offset":2500,
|
"Offset":8450,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -161,8 +140,8 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"MAXIMUM",
|
||||||
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
"Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
||||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
|
"Coefficient":[1.0, 1.0, 1.0, 1.0],
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -192,9 +171,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
|
"Coefficient":[0.385, 0.075, 0.348, 0.302],
|
||||||
"Offset":-990,
|
"Offset":-4950,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -85,36 +85,15 @@
|
||||||
"Coefficient":[-1.0],
|
"Coefficient":[-1.0],
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1-RAW",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
|
|
||||||
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
|
|
||||||
"Offset":-670,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"MINIMUM",
|
|
||||||
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
|
||||||
"Coefficient":[1.0, 49000.0],
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
|
"Coefficient":[0.259, 0.652, -0.161, 0.03],
|
||||||
"Offset":2500,
|
"Offset":8450,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -167,8 +146,8 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"MAXIMUM",
|
||||||
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
"Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
||||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
|
"Coefficient":[1.0, 1.0, 1.0, 1.0],
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -198,9 +177,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
|
"Coefficient":[0.385, 0.075, 0.348, 0.302],
|
||||||
"Offset":-990,
|
"Offset":-4950,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -85,36 +85,15 @@
|
||||||
"Coefficient":[-1.0],
|
"Coefficient":[-1.0],
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1-RAW",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
|
|
||||||
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
|
|
||||||
"Offset":-670,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"CLOSE-SUB1",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"MINIMUM",
|
|
||||||
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
|
||||||
"Coefficient":[1.0, 49000.0],
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
|
"Coefficient":[0.259, 0.652, -0.161, 0.03],
|
||||||
"Offset":2500,
|
"Offset":8450,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -167,8 +146,8 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"MAXIMUM",
|
||||||
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
"Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
|
||||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
|
"Coefficient":[1.0, 1.0, 1.0, 1.0],
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -198,9 +177,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
"Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
|
||||||
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
|
"Coefficient":[0.385, 0.075, 0.348, 0.302],
|
||||||
"Offset":-990,
|
"Offset":-4950,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue