From 3014b79e70db798bcb382eab01416c4e3128c6a8 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 7 May 2024 14:18:50 -0700 Subject: [PATCH] thermal: virtualtemp: update vt models with dvt and cuj data - Update VT models trained with dvt and cuj data - Use backup sensor during undersampling - Remove battery thermistor from VT model prediction Bug: 337512118 Bug: 338596757 Test: Build and boot on device. Check VT through dumpsys adb shell dumpsys thermalservice Change-Id: Id26238f7baf58e23ef5e1c771d2ee6cf8968ec8e Signed-off-by: Sayanna Chandula --- thermal/thermal_info_config_caiman.json | 4 ++-- thermal/thermal_info_config_komodo.json | 4 ++-- thermal/thermal_info_config_tokay.json | 4 ++-- thermal/vt_estimation_model_caiman.tflite | Bin 4913 -> 4575 bytes thermal/vt_estimation_model_komodo.tflite | Bin 4913 -> 4575 bytes thermal/vt_estimation_model_tokay.tflite | Bin 4913 -> 4575 bytes 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 8bd56c87..621037ae 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -225,12 +225,12 @@ "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"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "PreviousSampleCount": 3, "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" }, { "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 7cf2347a..effe1db8 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -214,13 +214,13 @@ "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"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "Offset": 500, "PreviousSampleCount": 3, "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" }, { "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index b240e5cd..c4e1d39b 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -204,12 +204,12 @@ "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"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "PreviousSampleCount": 3, "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" }, { "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", diff --git a/thermal/vt_estimation_model_caiman.tflite b/thermal/vt_estimation_model_caiman.tflite index e3d534a66de8141f6d86909f408e44ceb604fcdf..e62d983e617c5db24bcd2c0eade4ba746a4b9837 100644 GIT binary patch delta 1519 zcmY+Edr(tH6vi)k@X+uG1OcTMg(71qhCmV`xqBl}S``$0Afi~U3bxgbXb>Mr5K$gN zNx0TpFd{w>{G-Ys6)^WKiXx*G1+=u&sXRm;Lme%kA|Q0Z&UCsnzdd`t-E;2l%$={? zv&~)aJ#CdGMQtIxoNiFW@fHpnP8aAxEGSA%@FMh@QB^&8t-qXwihaOZBic}pp@d(#-Z&XulXeiH5yEHpF?n&rwTmINO1kQHGXbbLzf+rF+C1->I2?c`04X} zXp>yvRwSgW2Nlg+e&=>({yKr?v|}Vwnpi|@Q%jhq`d+klrp|+j-@lUSxEQ1<%P@jO zlMFxJSOFW6&?Mb`)D$h;$n_Q7Len~L!|~Qs+TrbGw9+RJjifb!@n;Xhh3QZ4(dR{82reh);#0^M@d8p;xVOz{LD%^%|Sce~AyfrobZI zRudD~ln%}*2E6NRAEKWBgidCMb47n}c%Lx{=T@`K%AHQw&+a>>xO;{s@1qxV%{b@sD%_z;a)icB-{O$)t6;St z3h&GC$0uiBWGYGtS^?6hKhIS4aqmXw(58X1VJ4^mV88~FE17%GW zqV_wfuMIW;z8V9e{x$Gq`E1b3t)Ob_=iHv|5G32N2pY;|w8yC``T_3%hzE|Ko;%k- zL6?Eeej)6B`;Ja7l*8c3om~79F*h31&4qSuM@(HL9P1e4s%ui=ws8eryKNAiD(?qJ z-Q(lH#gdzaeu)meiALG6x!j&D%Msu066f_-8tU7ertUab0$s;$nsz@}4K4+FxZe99 zK0Fx6JgGl|N9KM3p-)Pg+*e=Y9nOxm9wCcyVYUbwt@kovFC3W2kxb?dUC(?UHy@Av z(v7#Z{D57o@^$!FA`S!$Mf9;bP-K74oLKOZ1gK=n5Af+wTOwK-@* zb&Bb%qR^CSZCy91g}-}=W<6>Rq9}9XMglUwcdkj->KGLSS7@xXJTqsua{4Hl%SB2u z_lZ8SDK0LF_N%P4bt3lUBxJ{VPHdpHoE@=N3jF0VCEH=^D3JRGsMun0Ae&{Q63A6j z6;UNZMS#CjIwjAvl?(h8GT*7gN`OVF$ BdVv4{ delta 1733 zcmY+EdsI_b7Kbk+h-k#9u_KRZV{t6_2q7Uale;f!e2yU0L6GS~WMv8zAp!+wL_-~L zXkjtIt2R<`z>4^2fe>CxbM`@ep;l0;)j_Ilr>#&cRk2EomAPQonl*Q=Z|}4B`R#qq zxqs~2LC)Fsc@qMC7-pV8tE5c(7thQmW&6u*lJN{97P#-tF!ch-B8E{41PjOo7=eAB zf<{;_7#bNF^+iG)DELUFGEBzEh4l}@@NwTD8SrqcMmdvb_jC8q5p_C_QXImG9hUVtxDiX(J zij2&+Lerj0vqD#`SiB@^&64?oRN-=Y{N&-;`3rwk^oECm_Ynu!+MbMzoECU>`1#d? zh0~@7nYfWFGid(^!Olk=aA@@|^m4l3`b?*Ld5IjT`hNX$@7~7In^c{%KVHycQqX2s|Hv`E;B`UedM+;_>ui}PY0S+ zXK-kzo|Kw}vlN>^pD{#k*rMhUO>+!ZihS@&bseS$5peu1lzh4DEPPkyh5V8#yr%d) zZogEFL%Jq(_v{7xwlk3bz)d1fww|bz{^V|$QUJMS4R~uuET;XboGdrW$;PQ`(X`D$ zcGMq){Od1}#P{_WzOx7;*e;{>_;q)|udjf${yf@X4M*SedPsJ~zDwI(yXjYoXbLO+ zxVi_?)Q)FpPS0G}(q)BN4Iy0mimO=NdmoRPmXTTOYB}?|GJ3x^glZ4&`VgLdlx>?&7al!hyw&s)*Alk}{5K@R&1hilKQBh-=WoG3NGaO=pW@8@%W!vO z8!4<{=#Ib+umnw^&MrCi-uT3r`eh8dyGy|x6$dZ(7eoG)OfoC25&K@e0QPB{z|(#N zHxI8M9hF;1#MwsU(EU!r1-fus_XM=t9&&gfVJSw0c$&%|Mqz5F9Rp?SAvt-Fbre5g zOFW7oqo4%6w_d>3ka=uQ=svpj#39OVn1jdt3DxP|r<%qh%uL&liUm6Q?N<-zsUCms zqU$ltuI+=ygo(6oOEh*x4zQnH({nzjuj3tF1$3~2TU2n7vlXw|3KwoAaMMejT==dz z+^W;I))#ZVh4#)6tEZmeDe^bRD6s%egtFaFuVN^6^jD2Q?3nTvI6GeGT%3M@rUuo=;b+8!bGj|;%hyB$7e}2;}Wy8Et!Ai z*Za;DYm`bQ@8LUL9Ih7@tEEQ1MxqyM^kLeutWskzjAeC`3?gl~Zl~{bFRekX)Q%-P zCTRqz+At~=g&9`f9~mrBXeb1Lss{<;+v-gjq9B{n)omJOxeEx diff --git a/thermal/vt_estimation_model_komodo.tflite b/thermal/vt_estimation_model_komodo.tflite index 9b74cd2f865597e1d9b78e60d920177304be4d07..336d9a82a8252759df93bb2bfb0c98d317c4372d 100644 GIT binary patch delta 1504 zcmY+EeN@b86vuxvO)pYvDymgV^nz3~HKt+aK1nZwQpm1$mnEgM+D$1^UM4Mey;nb5 zsYKRh&l0r=Ykv2cl;yOE!m329mnB*{thdlU;ha7Dob$Q&x%b@X-sk@Ft@h{~k?U<9 zW5#jujK>4>#w`?&f00*KtP3&aI5oqIanFR~9E>>bhM41885bB;j0lE=<2dolzP^4R z$YLkvBmMkjcI@WB*>TpK1;<*mBViHi!*FGUFgA-gE|+neVa#HgkDrep^R66s*i_sj z5{LEjuZ-r3D)?B*P+j1QzCJahq4)hXFIJhcqye*5Y)%7StC=HY91NwRwgB4o*9Q8uMoVsgyNo>Xy$a@?tHJ;AeQ=w@(`WWR zbcfQDF7VQ7;*#~GEyfqT!*U?!b~34#Y@zBm6NQzTpJ2XW2#v@&PMxN0LS7fVoqFd< z$x^#w+NuW9Ds{*5Wh>$1w|&B9h*527IO z>&0|UlR44NI%iB?8phJ8*Ka^MUq&-U-4JA&Ko9*`LYJtvKznr;XuB@p)g_KpTXI1t zDQv{)yH?<&mdogQry5fli!?bM2hsZ63B2^DGj2>!!RUEW@bsVISg^bpr>%2_+zpL- zj~F)ydodFtREIQx!l$y z@Z)9?kBaTIcCq$k(zG=J ztOk_92QX!AuEu`(ek|xIKqsFwLV}$Di8V8E?4ncPw%-)3iV@;dLNLQ_4_Mdi)NiO; z4^<1!;MP5M=#w}MK2Lpm4*sw-paU7IF}!vV8v6dzfg61l6CGD)21Ry@YqOUmko;$1 z1||<&ck7zkrqHeW$hs_jf6Q?vOpPSWzE`e()e7;=4LTe&AYCkS;ExXMWwzQv$?ScL zv4addDrV~@d)nGFd9pX=--_+|36=`}m8DYRrwRzea(`B_(MT5P&)={b!mqVXm&lYdWq&hXDovBf w15|$RdX!3+OJuTlBK*`H&j=BE-PaG%hU+crk7KK>wX0{_tHonXL3!P1ANB{r; delta 1718 zcmY+EdsI}_9>)*EK@f-cAc&IFg@l_h%nUOyz?{7a@Lsa+%aRA0g9aNwV=I1CYQ+> zW*M`DHm~iBiQOJ2UA7}O?)~IAnKUXcDS1c2`%71y_@d>j7x_}Ftf9f|S2I!X?|hZ{W-}Q-lbvg59h;o&q(n~qadmHc+E{cp zv>9jN?{dx|kAg_B)TvQYR1O-@TS9f)DHJ(647*Ejp^X3S(a>)$2tNTL=eJSG;|d5q zn2oNRDoy2mVkB+05GEBDz^VQW9Llahmaj)c3Ae-~+IN-n`nkfuSw8LICaSh*tvq5wsSv5kF zG?vR!cEHl=#lW7sBy1fzjBc2hz@5Hs;c~Mlm$&(2Z3g@ko*q90BgPI?*|rLvY^~;u zU54x0i-n6J#pOe|*IodRW-8EO4TrR+y%F+iMs?wbg;Lv%T-A-UXk+uFkQe(A7k&9X zB#8s0bf|)wnZ4l9P!Bov81!Lx1$Q`(veuh^2>_^$ofyn)SB^v)G zUO3_Sv9N9V2F^;B32VMNfqcsBxL?-DO*#9&0$FtztSK#n1M{vx`HDoOl+Hl7Xg~a% z7R43Tx}&iNCBlYGFSzUV4>bC<&eU@>7!p75L4s~RF+B8kB_hkEczwAwsxAp8sWxt* z*U3TR;F*NI^_xiJzzlrTREZWW?J_-ISfD+mvL>G=pT(QIvdM#dF%Ampg(o^Ada>UH zgYN+nv-eG`?l2OE%tCBuGH-3*YEhDOKI$(FC+)reCJ#3pftF*Rpzw?ga@y6&fNNcA zxo^GZn));BNZh`Ks52{(yx7&wl^u1)rFH9Z?)?*x*pQDS{~iy=FGX{~^_jSb*$Vak z<6O;K#n|p*37$wlXPWc)87>Xn0v6-vk?x8&o}KU`n&V!K+=iWjpCItz0R`^<)iHF` zJ`g6&8e!8G7c%>q;i)ikyACN%7Q$%1iR`ZU6u)<}4!4-Ah}%sy#Iu3q2Vn{E%qSP4 z6RP0qOXjW8>Z^D~h(CUG%^s~)*OV9kv{k$t%5We%6rK7{w=ss&4!NfHt7Bvb3#=Ycw&>0 ziDG_#m%H;Qk7%5>k=Q4$__1VVsHWo#cB>yozTGj{C8Q09#oofceLAd3{~I*7mEqjI zdE8LrV2ks@$=8{DQE4hml#P|E0u}tA{RQb?ugx$H|Njv*8_mQv{CNkD83T?}>VE;BZO4=V diff --git a/thermal/vt_estimation_model_tokay.tflite b/thermal/vt_estimation_model_tokay.tflite index 6da83d5939066eb4ea58b2efb4dec12601e2b84b..1563177a18823f9aecca5aa1eafbc8550a87736c 100644 GIT binary patch delta 1489 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 R3B)fMdt6s99(S|t{10plzWo3I