From 61a7a29145d3104ffad0ff45575d8f2bd55d4089 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 7 Jun 2024 04:48:47 +0000 Subject: [PATCH 1/2] thermal: update vskin correlation to v2 - Model: based on evt 1.0 50 case and Proto 1.1 150 case - Legacy: based on evt 1.0 50 case, also update the trigger temp based on legacy report (b/333834000#6) Bug: 333834000 Test: Build and boot to home Change-Id: Ibe4988ec2e9944a81c7a64a0315727a6c942e2e0 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_tegu.json | 49 +++++++++++++----------- thermal/vt_estimation_model_tegu.tflite | Bin 2877 -> 5364 bytes 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index 9e79d32..d30ccd2 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -3,7 +3,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 36.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, @@ -13,7 +13,7 @@ { "Name":"rfpa_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, @@ -23,7 +23,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 36.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, @@ -33,7 +33,7 @@ { "Name":"charging_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, @@ -43,7 +43,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 27.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, @@ -59,7 +59,7 @@ { "Name":"btmspkr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 27.8, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, @@ -69,7 +69,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 36.5, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, @@ -79,7 +79,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 28.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, @@ -126,8 +126,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], - "Coefficient": [0.187, 0.091, 0.004, 0.062, 0.091, 0.215, 0.228, 0.114, 0.007], - "Offset": 59.0, + "Coefficient": [0.194, 0.185, 0.084, 0.004, 0.036, 0.202, 0.069, 0.208, 0.019], + "Offset": -1967.0, "Multiplier": 0.001 }, { @@ -137,8 +137,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], - "Coefficient": [0.032, 0.187, 0.216, 0.0, 0.036, 0.004, 0.194, 0.046, 0.286], - "Offset": -71.0, + "Coefficient": [0.117, 0.015, 0.013, 0.112, 0.185, 0.279, 0.157, 0.013, 0.136], + "Offset": -686.0, "Multiplier": 0.001 }, { @@ -148,8 +148,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], - "Coefficient": [0.213, 0.122, 0.014, 0.01, 0.117, 0.019, 0.208, 0.187, 0.11], - "Offset": -241.0, + "Coefficient": [0.17, 0.029, 0.01, 0.004, 0.008, 0.252, 0.37, 0.129, 0.027], + "Offset": -913.0, "Multiplier": 0.001 }, { @@ -159,8 +159,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], - "Coefficient": [0.124, 0.168, 0.153, 0.017, 0.064, 0.006, 0.248, 0.051, 0.169], - "Offset": 63.0, + "Coefficient": [0.138, 0.071, 0.035, 0.107, 0.009, 0.204, 0.338, 0.049, 0.048], + "Offset": -358.0, "Multiplier": 0.001 }, { @@ -170,8 +170,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], - "Coefficient": [0.017, 0.098, 0.062, 0.222, 0.157, 0.0, 0.215, 0.013, 0.217], - "Offset": 595.0, + "Coefficient": [0.009, 0.084, 0.0, 0.261, 0.247, 0.008, 0.007, 0.051, 0.332], + "Offset": 365.0, "Multiplier": 0.001 }, { @@ -188,12 +188,15 @@ { "Name": "VIRTUAL-SKIN-MODEL", "Type": "UNKNOWN", - "VirtualSensor":true, + "Version": "2.0", + "VirtualSensor": true, "ModelPath": "vt_estimation_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], - "Coefficient": [1.0], - "Multiplier": 0.001 + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"], + "Multiplier": 0.001, + "PreviousSampleCount": 3, + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "TimeResolution": 7000 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -209,7 +212,7 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"1.0", + "Version": "2.0", "VirtualSensor":true, "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", diff --git a/thermal/vt_estimation_model_tegu.tflite b/thermal/vt_estimation_model_tegu.tflite index 5fdd461115e2b5e78b0700245b2b31bfd5429dc2..ba89efbd211bded737a9bc9b7a7b6a6bd9521637 100644 GIT binary patch literal 5364 zcmbtYd0Z3s5?{arxjgEHqDDSm6@i2^NcOkj(G~%vNWC#GWWh*6Vm3i7kLv65z*~#r zU0=OgFT9>wG5cH3indj0z33&yTCdv60^VEQr08y~y>2tHSIw6a<8LWR9ll2auMYs_cCdpwc#ZyGJqc-pwaJ6i;s?d2#WUZ49OFXyD}aH+hK?AVIy_<6 z&;}h(h#KSf1bK@mbdCC4t;LpW)f)wEo?sF6rd-GR{sT%o04o7+0Mw9>o9+x#3Ah3{ z57-Sz0-#^|z_}JR++%K%l}c6HCo+zHQ4@3C5ugAJ0xW{k9-_aJNMPOzYJq=$({EN>&IAd z??M477D1=aw2BIFqsY@+tTx`D5Oego3ael=D}WjY3E7HF!652wVhGb3=8Q;4O?xXo zDR_8d!cavTr~wbccdUzH+PG>37>>~dIL?}h1G)f!x^;DhQDJr9{=sm^T%r$0C1^8E zxmo(`kVzu!3hV=5pefhN>vKhjEX$@SV~R0%ioqfj9}n7$`y*!!rGcJv&;06Z7W35uz%b1myk>BPxpI!D zpHEx|0_CU|7NQCdfpulL?4vD}iwBpEp@#a^0OA1iTzYXJDUyCU6zH4Oe{p6?Y18C` zoR9INkH>_*f2g3H6jQ=3rR6@;=@ru&^;>WKW}j4ip1qq=KrUaMPl~lBG9~G>`jX2Q z2J-Fq73`t&#dOn;diu6@B;9&dq7}N6G`ZG;x`lX2m)a;;K4=svyq--aW+l_Utu{)d zCtW0~2WQgCGbc4}O|qqoW-UpX_e|+ZRUVnvv639f4j>Coj3;Mrq_UNjJL&XevozV; zw%fm}^rK`(S9?%J9O-ssChMKCg;WgLNCqdbr?&%^QRPRi$<70pq+ZuE563R~k~GtI zq7$oUvk^fdq$r|_^)ZE!iw`2`?LYsJPM3G0*))bKKj=UgxUFQ5X_Dxfdn+kF+gslI z)pB~d&6i}0c#D3x>n_Plzd%nO8$<7nE|vmzjUhF@i;3r=qlEdfH`y9{nQYO0Nk?Va z4;StJp1!wh8{wO@=N@sMM_Qs&Q}(_^o8BgcK@aump(a^ z+uE*J{-Vr6)P*H9;y@s03+~Dlu52%-mz5KtdH@Mm&z1MLFOoF6Sb2Y7EO&LWH@9eK z6}{)SjQ9rSYX;etQm_8~$VWAqWNyg}l3S5LKM3W>3AX{HKq{tll$WLaALp^wtSafi zj9DbUAeDTk?nY<#d4*m(x1H_W=Mb6lzlC&6UQ_BH|4*9ly`QGEOwow(OWB9PgGmWH zgw4yoL(S4GIxFBHD_mH?wi>M_--h3#(Q~><4q4Wg z_1o8mWVr7k>+C$Wg#?jx7siq0rRD6U)2Hc~bw0G`{W#(^b1nUO^*|~tUQePtSCc;; zN7`H4yx6@{?rWMT=h&}sBgmeXStO=QI30Ph4c%0^S$apxrR#k5P_g@XvbaWO1AIMb z*N921_%Jw!@cd5xW;@uu^AchhT? zA9L+is3iZ%Z_>AO@@Zkt4K}35S<-g%Y8sr>PWDLN%nfZ7IVpeBowV_5Dxcna znI4MygLZnmhOX+Bz)kV}jsD`7N6z|skn7piwCV9Sbb#eLnKtT*rsj4eH#2{N{qw!m z)LJ=(r0;1V+j=dfLq6X?3`UWT7$3`xT(O3%8`o3r9kqxoo0=&vy?2-lo>Ew}o=~g9^5__^VVjYPEEei{ozZn?Zu5QWA7yo!xIj zw!Cad35lA$fR%lH_NRS&kChKE=tC**&$)fqnR~B%ynLWfU*m9qK($o*#9e>=@pPdV2lKKB(V(+HKxt>f2_!{pZl1 z*u$F_vDeoR=T<$;p)%P|+Rd$^`-V)X+M~zGdcXa|bhLw1$ctR(2Y1Ov_Z?)onw6$+ z51_r0x^vS`#dDX~BkbsWQSNZAhJNJ{D_7iF&X!HND=pJ1xlp$)_Dws@q`cxBUHel@ z)_AVHe5y)CWOGwGd(8^&=Xd`>*Y0f2J)Yc3_V3zKPWM?$jX6HtzwQtu z)`8Y!;qe$QIBhH~xqODiZkQnd*>$wM;?t#c|F*W|Cv%Ye{@XcRvqE25GUE{GxB+A_ z-Q=>Szme{D7Lban<8%;R%N@w~l{OVWB-4l6=mT{L_0#p^%4Tr%w8bP{J9$GI`)LYY z{mFb1{Y9-^+gDBRU6)Ad*qQWhyMZ+MS{D89_C)gVK`H65;Tz()Z!z5*x6D4Q^oYIB z$yuak#38%*RRR0m#f|pQ%>ksQg$GSYn@2spV>DAY6IxZ{e81s)rPJdW`L)hNj&xaA z9M|>3q@$(1JY#pfv5VW2?|N%uE5gslMRs~WuH)uwM=Ct? z;`a_K=0c$7!}l9P_2tgEM~`c3s{z;_CMPANDxgt-e$FcBLLB`D_FW9)SKk3+F9>aJ zeGgm-*FOMm0??)rnhYS0UUV5y>^+b_8~i$Z7seCc(RgjGuC2wM276rWo9o`q$U~o< zTwS-f%P01SFcOg}08YJz_xkEps|fPY4pQt3(GIQwyZ1UfjpL|x#ew=52M(mz3!oj0 z&*=;MMCflppaGl*W+6ZWC+|Vz^iokgh0JI6IaID)3dj4=f+{#;p zESn*Pw^;R7=%fYRK;B^JuXO37Z$#BI>|$(jfI7Rlw$DJX7f?}{Y!jeG=MABbBSfe{ z;B%&FErQly3r)i7RKZ|tSSQYX4QdU@Q?X+{lK@ZpP=X%D_ZJ_@yfxWoi2VzHfSwoQ zbvl^hu!HMCe}Rw-AZ~b#z&+>#SOWGjH;wIRRiRD~Aj5d->`ZE82lt@|;0oC30JO24 zIxA=c{o>i8q>&A*0o=0y;P(dl7aOiMg{BI;ZUk@9^BD$Vn7KYChH3A3Zk*MJ6@a5T za2=z5%@_loD`tY9SAjP618aVcC+GSx2j~mWsrY0%PpVjR4Zg4z6)vE@22i)3IID@{ zk72sNb)$1BoKNxm>FD^Ms!5!OHWUENHylfAGl0U#z;hLzJyC+sI~)aZv`9(xXo9i8 zX{E=hQIG6r$99A*M?CZNlJBK}5txAI+d;gQ5A3fP>tG?>UA9&sd$EY%7kMk{0oZ;4~HY<)A}fkj0sbQg(#o0lU{#U&@kaS!A!R41?!7P zql}4uRy0wn$nckmCUYWh$;M9(FPffcW#lshid2V%MZH9NY+{DiJjL?D@kFYlAP)`M zuiM9nsF&NW469Kz=lqR$qN8G-6A$iWeZgRyFH$}_y=Z>%m8Q< E4^t2ErvLx| delta 1546 zcmZ{ke@t6d6vywQpY`gI4Gd+lS!9 zbTc}$1ta)OhK8_8z~N9b6A1>}+btn;B5owh67k23W{L0zKU9Jlfz@+cwvi>ir`q~)Jj)x7NhL?E}c}14(twqTw5vfre zc;#S6`nN&b40HloItFk7Fb&G)^d?RZMhQ^lsjdmsIYkwMLKSSNHWRN^^q_xw@`1hi0o^gCYVGN>@E&H2E#U}%_3yL>6Wr&ZE90Q z?sTKxHECE@xE)A77NoA|noyy|K{@jJ@!*NSh+weIcY@4IHwF_b_w z)p=ymz8sjz{WMTj^A107>K~#WRgiyI`bho`H_q@Dj*zyu&yXvF>4xOI1?(oj;jdCN z$;~YT#Q$Chm%e(2*FJFpyDM(v?2CSEY(5*<7m~<;c@m#Kf81~`_$B}Dyb+HyG~uh} z0z46VcvPBW+x+V%iO{sn_`qH_*pKCxGiLYGju@yiIlLn^N$c_0Q!-=6YADpXD$Oek zpY(yN9~cB^x4q8hfCfS3p;CbQu1g11NhUe`P_#~HFsSozVbWgeLr8-*!<&}13dU%_ z)>1b@akQluKx8qo;qmanNQ-CCo$uapw{i&1%KwF{WN|pK(_-K4AG)a1KmF9iaJ>;h}X(r6q;KkLwu@&O6XFQ zk`Q0QD5Wpr4bfDtkp7B)0ltegLySV2)8wfY>q=T$k})C88@Vc)dV8y4E`9PVO%5d) zw!N`h?_U6iD-}pq@Uy;w($c0vjJ*0p0+JsxGw6*sm8NngYOC!3LPoMm*V%un9Yk~j gynZD;xMB`hMn`6NB)X|QnkEFc$)Kaq{t%w!Kg#R2oB#j- From e2f2401f32e34c4a298a2719591513eaed702b2e Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 12 Jun 2024 05:06:07 +0000 Subject: [PATCH 2/2] thermal: add btmspkr_therm as trigger sensor Align with latest Pixel setup. Fix the issue that sensor trip temp not updated. Bug: 346562574 Test: Build and boot to home, confirm the sensor trip temp is updated Change-Id: I588e65e72158a0b9006f949688e0fa18e4f6d2b4 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_tegu.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index 9e79d32..d92cc60 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -211,7 +211,7 @@ "Type":"SKIN", "Version":"1.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-LEGACY"], "Coefficient":[1.0], @@ -233,7 +233,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -249,7 +249,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -326,7 +326,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -417,7 +417,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -514,7 +514,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -587,7 +587,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -619,7 +619,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -668,7 +668,7 @@ "Type":"UNKNOWN", "Version":"2.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], "Coefficient":[1, 1, 1], @@ -715,7 +715,7 @@ "Type":"UNKNOWN", "Version":"1.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], "Coefficient":[1, 1, 1],