Merge "thermal: updated BTS equations" into main
This commit is contained in:
commit
91421bcce4
6 changed files with 12 additions and 40 deletions
|
@ -169,9 +169,9 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
"Combination":["quiet_therm"],
|
||||||
"Coefficient":[0.05, 0.14],
|
"Coefficient":[0.105],
|
||||||
"Offset":560,
|
"Offset":2576,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,9 +169,9 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
"Combination":["quiet_therm"],
|
||||||
"Coefficient":[0.05, 0.14],
|
"Coefficient":[0.105],
|
||||||
"Offset":560,
|
"Offset":2576,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,9 +169,9 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
"Combination":["quiet_therm"],
|
||||||
"Coefficient":[0.05, 0.14],
|
"Coefficient":[0.088],
|
||||||
"Offset":560,
|
"Offset":1882,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,9 +169,9 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
"Combination":["quiet_therm"],
|
||||||
"Coefficient":[0.05, 0.14],
|
"Coefficient":[0.088],
|
||||||
"Offset":560,
|
"Offset":1882,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,16 +164,6 @@
|
||||||
"PollingDelay":0,
|
"PollingDelay":0,
|
||||||
"PassiveDelay":1000
|
"PassiveDelay":1000
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-BTS-WINDOW-PARTIAL",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
|
||||||
"Coefficient":[0.05, 0.14],
|
|
||||||
"Offset":560,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN-SUB-0",
|
"Name":"VIRTUAL-SKIN-SUB-0",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
@ -867,10 +857,6 @@
|
||||||
"Sensors": {
|
"Sensors": {
|
||||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||||
"RecordWithThreshold": [
|
"RecordWithThreshold": [
|
||||||
{
|
|
||||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
|
||||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||||
|
|
|
@ -164,16 +164,6 @@
|
||||||
"PollingDelay":0,
|
"PollingDelay":0,
|
||||||
"PassiveDelay":1000
|
"PassiveDelay":1000
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-BTS-WINDOW-PARTIAL",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["rfpa_therm", "north_therm"],
|
|
||||||
"Coefficient":[0.05, 0.14],
|
|
||||||
"Offset":560,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN-SUB-0",
|
"Name":"VIRTUAL-SKIN-SUB-0",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
@ -867,10 +857,6 @@
|
||||||
"Sensors": {
|
"Sensors": {
|
||||||
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
"RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
|
||||||
"RecordWithThreshold": [
|
"RecordWithThreshold": [
|
||||||
{
|
|
||||||
"Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
|
|
||||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
"Name": "VIRTUAL-SKIN-SPEAKER",
|
||||||
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue