From 44e0d4821c41c090645fe8caf403f1bd8213a52a Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Tue, 22 Oct 2024 05:10:43 +0000
Subject: [PATCH] thermal: update odpm model for DVT

Test: Build on device and boot to home
Bug: 366375997
Flag: EXEMPT config update
Signed-off-by: Peter (YM) <peterym@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:735b0afac07c67d96b1f76049079163475c08786)
Merged-In: I3378f90f40aee20e3c15257120f22a6d5cff23d8
Change-Id: I3378f90f40aee20e3c15257120f22a6d5cff23d8
---
 thermal/thermal_info_config_tegu.json        |   4 ++--
 thermal/vt_estimation_odpm_model_tegu.tflite | Bin 7938 -> 8256 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index 4cb2882..fcba58a 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -193,8 +193,8 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_odpm_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "btmspkr_therm", "quiet_therm", "usb_pwr_therm", "MODEL_MISC_PWR", "MODEL_CAMERA_PWR", "MODEL_DISPLAY_PWR", "MODEL_MODEM_PWR", "MODEL_RFFE_PWR", "MODEL_WLAN_BT_PWR"],
-            "CombinationType": ["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM"],
+            "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery","MODEL_MISC_PWR", "MODEL_CAMERA_PWR", "MODEL_DISPLAY_PWR", "MODEL_MODEM_PWR", "MODEL_RFFE_PWR", "MODEL_WLAN_BT_PWR"],
+            "CombinationType": ["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM"],
             "Multiplier": 0.001
         },
         {
diff --git a/thermal/vt_estimation_odpm_model_tegu.tflite b/thermal/vt_estimation_odpm_model_tegu.tflite
index d1fceb429a0926b3ec556f9a78f8d1cf23f76c37..58f73db921805bd3fd2c85d772fd83eb5847031d 100644
GIT binary patch
delta 1790
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

delta 1737
zcmZvc3se+U7{_N>M4;udE2xOOVkl<dI=i#GGxyE{TZ<A1VOsIfOvOs&NWMEJx_}~3
zNWzE_86hY0!7JN{nL7i!imwBTA}aX6Bp;aIgHka|X=JNo9lvva-#Pc2|NlQT_nvd@
zrp&M{A#U4UF|1NVR-jLD3hFN?FZJCx6vNU)7K(I8F)T-fV&0MjN}gEPNX$-7uRdZL
zq;n+YjMCZPf<G7-(1}nYMv<0B0|U;O=n%o`RFT*!k*zOAV#mitVpp9bv8o}FSkstD
z%*7>g(yeh3y$4fGE#QdhTrT&DTwV~4Vd*BtAC3%@7;&`DW@^4RP#-cg&ORwYX7^F}
z+h%l*u_yOT*q@!(Zn4EJeBV@d`<$Ih2nj#1`gI}f`^UD|uh!ZdyuJ>*u)fbU=b5nI
ztK1{VWtYsYiqL}(wziq~6rDG}*}TncnYgHNT1QsnmgUyQ@CeBi#WdByZ6(=_g&+Gw
z#NWs<k1oAto|RT?-urh}y0|4i?H%lfuPhl5m7ZeX@09|1Q#{JfS_O_Z<Wg&g)p6a&
zC%_o|s&P-|Ydn#+PRPNdjA!Pq<K-{7p}mRgxdVRJs0B^4!IDk+sB)Mbbp|v5=f)oR
z0j+|42Le!)(-1+^(gw_BQ#tx=AAW_6pxkfo;F_;^Q01?l;3VgEBCTaqEL>JR1*Ucu
zfhit4`OJ=bp^_@1_n$~IuDp0jn5`v++^Vze-Htr8J-(J*&|o9mN`g@|IS$?>6W{~?
zX3$y`$4B_N@Sk>EW^3oqhp8#GD0J*MJfYkHdKEv{B~+%f#nTRhGSw&0uFvF{^`p^^
z^M^Ru<aA_-au;Z>qMN>Wa<ehoJw@meYT)&*m*6KQIQN|!<d&}uhk^NR5Wl$r<yR~N
zHDjyM%A^@QcRLAIl?p(z*kDXr@P=@2`byq8aVg4ZlcJg?0DoJYkGPajnEK&oDE;9+
z>J?=k+_{>80~@|HCTCQ#8e<&&QA@1FC_QtI_Dva&RMR~;lVUuzc!d&v-1q|*pB)S5
zA4=dpcS+`gznu*GUpqzRwj_i6HiCZlN<TPu-ILD60W1o1LC4liW=&URDCcGX?D}N{
zD&KY;G}akW-Yy>a4sqr0EVrR~eO7@>|APMZVIJSqI}rq-4m7*l5(FOBSF=ZcTYyg2
z-GamlDL7VP2VY-lf<fxS`s#TZ;B@An^u#`Y-nIB;nytFTet5YSgq^n=VkS-nX|qz$
zz^)K@$X3D4oxXu%oqhq5=&=p5E#uikQ-=wzJxA$9g;RuuT@YQlQNpQ<PJ%^&V_`Dh
zLY>H};Z|5?=aI(~cmLQOypfk=+xXr#e=e&)XN=B?5@NVM&ZllQ9PyqHl5gt=XYZ*{
z^UP`_x!{Ik@5<Rd>;ZUhIfow4St*>j5lU~)xR2gBcm#%iHV;J=ZRgTX#lhnCAaIfE
zqF!uL(tbTzXq_>JD{1ZFC?Sxy#+-!~HgY6fZ?A#P)oFayopxyb)eo7r&IHb#Wvm94
zgVt{(^ar<Hc(0`IsT!FIJXyL125WoK{Y@LuUXPLWn=yrP<QE}ApL!qYl<$XYj@+TV
z?e|I79bxF!r)JbX>q|}__Y*aAswc1TT`LT!Si+^|QK&)M&o7Ps(Hj{C9GAt@OJ{h4
zw^i!qCzW_IN?EYjqh#R{PiwAhf<#>G^Z5Mf$deR%hG(qjc)5RKaD+tu#0$focrh0}
zr!l*I3Y`r=V_+-_UuOdWaK`3MGZVZDlm<#?P~#!)0skulL1-PSLf<V)lA!d@RgpTa
zPRweR;uJm@4uBR6hTDb}N^!koXwc(06F%I?oK|d=;v_MsBuLTn^fSD@3zeb(f9?x3
zdO|y>>XsKtaX>n(!0`vxxg&Nu`DvbKq)0#v`VvR|pwLhRp(dU!X1_OJ;{9vg4O%^^
z#sNX<9i!2u{?zmGG+I5bc4*#GTD^6EREt~mZw;DfsLGg!qkI)wN~c%rNsUfRIl4}K
gJd)9jIXvdSXM<sK@pS*GbV)ihJYbwlmFnr_FXddi%m4rY