From 6131975e2ba91b6b575b5fb4fc32076efcea1514 Mon Sep 17 00:00:00 2001 From: James Huang Date: Sun, 12 May 2024 17:05:57 +0800 Subject: [PATCH 1/6] gps: Update GNSS official release 4.15.1_8_R2 + config for CT3 Add Chip_Configuration_FeatureCfg_SDL_BYASS = 1 to switch gnss restart behavior Bug: 338152369 Test: Test: Verify CTS/VTS, sanity test, stress test, SST in b/340060035 Change-Id: I1fc0d9c35517ed8afa5a13937f48119635b22463 --- location/user/gps.cfg | 1 + location/userdebug/gps.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 6080ae8..43e3b3d 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -34,6 +34,7 @@ navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_MTPL = 0 +Chip_Configuration_FeatureCfg_SDL_BYASS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 24da018..38c9839 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -124,6 +124,8 @@ Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 # Disable MTPL Chip_Configuration_FeatureCfg_MTPL = 0 +# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start) +Chip_Configuration_FeatureCfg_SDL_BYASS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 From 010bf934290fb5a371558796b7da250ba025467e Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Fri, 19 Apr 2024 10:50:15 +0800 Subject: [PATCH 2/6] thermal: Add step ratio for IS_WLC Since vskin-wired and vskin-wlc equation are different and both control the same cooling device, add step ratio to ensure smooth transition when user switches charging mode. Bug: 331904373 Test: Push locally and verify thermal log Change-Id: Ibda3e8dfd87dbb0bd5d72adef3cead51f48e45af --- thermal/thermal_info_config_charge_comet.json | 13 ++++++++----- thermal/thermal_info_config_comet.json | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json index 8ab9979..88f9098 100644 --- a/thermal/thermal_info_config_charge_comet.json +++ b/thermal/thermal_info_config_charge_comet.json @@ -123,18 +123,21 @@ "Type": "UNKNOWN", "VirtualSensor": true, "Formula": "COUNT_THRESHOLD", + "StepRatio": 0.2, "Combination": ["WLC_CHECK"], "Coefficient": [2], - "Multiplier": 1 + "Multiplier": 1, + "PassiveDelay": 7000 }, { "Name": "NO_WLC", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, - "Formula": "COUNT_THRESHOLD", - "Combination": ["WLC_CHECK"], - "Coefficient": [-2], + "Formula": "WEIGHTED_AVG", + "Combination": ["1", "IS_WLC"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, -1.0], "Multiplier": 1 }, { @@ -231,7 +234,7 @@ "Version": "2.0", "VirtualSensor": true, "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], - "Formula": "MAXIMUM", + "Formula": "WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Coefficient":["IS_WLC", "NO_WLC"], "CoefficientType": ["SENSOR", "SENSOR"], diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 290607c..143d4a8 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -709,18 +709,21 @@ "Type": "UNKNOWN", "VirtualSensor": true, "Formula": "COUNT_THRESHOLD", + "StepRatio": 0.2, "Combination": ["WLC_CHECK"], "Coefficient": [2], - "Multiplier": 1 + "Multiplier": 1, + "PassiveDelay": 7000 }, { "Name": "NO_WLC", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, - "Formula": "COUNT_THRESHOLD", - "Combination": ["WLC_CHECK"], - "Coefficient": [-2], + "Formula": "WEIGHTED_AVG", + "Combination": ["1", "IS_WLC"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, -1.0], "Multiplier": 1 }, { @@ -817,7 +820,7 @@ "Version": "2.0", "VirtualSensor": true, "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], - "Formula": "MAXIMUM", + "Formula": "WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Coefficient":["IS_WLC", "NO_WLC"], "CoefficientType": ["SENSOR", "SENSOR"], From a39a94ccd4a676c961e2288e710870ba9a264936 Mon Sep 17 00:00:00 2001 From: Juyu Chen Date: Wed, 15 May 2024 02:57:20 +0000 Subject: [PATCH 3/6] audio: update recording tuning table update - 6p4Ver 0515 Bug: 340699975 Test: see the bug Change-Id: Ic8ef71a76b249ae8ee539a2d68d9e2ccc995a652 Signed-off-by: Juyu Chen --- audio/comet/tuning/bluenote/recording.gatf | Bin 108180 -> 108180 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/comet/tuning/bluenote/recording.gatf b/audio/comet/tuning/bluenote/recording.gatf index 2c8c2fe092787f4458cb1d8a7d5ee14fd7b1ba82..f7760275235b3fd102fad1a3089a2328429d0c28 100644 GIT binary patch delta 162 zcmbPomTk&ewh0oGBQEnOl!gl>6c>u$lGrBgaNO&9>!#R4{k-#^{mcuU_aR&0&E3r{ zm%Y|9GE6_;z!(grm>3+UD>N~hZC}^O=*PHG<%*y}ZAp_y#Dmy}ZO#U7n%{9QdpEn{ mdsyI8lOU`=2Jp8Oi{2szhY~ delta 151 zcmbPomTk&ewh0oOH>`gks8IUu`m2?jFSNC9QJ6b{fA^|qD%?4LmoBioTPsqy`P23j zn>QTvTFdA#xqodigk*AXnEYU!+2*`;evI2S3K>rbPL$wL$n;;|>$l9xNRo4FhuH6} g3EEmN@@3Dbmt0-^`^4p||6Xl$!DGswCdL`c07M%|r2qf` From 0d5adab5854048fa40a599b5eb2b07b07d766ad4 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Wed, 15 May 2024 17:27:45 +0800 Subject: [PATCH 4/6] thermal: Add step_ratio to VSkin-Speaker-Model Add a step ratio of 0.4 to vskin-speaker-model prediction. This will help to: - reduce the noise due to overfitting - avoid sudden jump in temperature Bug: 339522501 Test: Push to device and verify dumpsys and thermal log Change-Id: Ia266e6135efca77e6dfee79b7111c9be1d53b67a --- thermal/thermal_info_config_comet.json | 1 + 1 file changed, 1 insertion(+) diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 290607c..dea136a 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -902,6 +902,7 @@ "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 0.001, + "StepRatio": 0.4, "PollingDelay": 300000, "PassiveDelay": 7000, "SendCallback": true From dcff9328a055a983602911232ad65d577d3cf791 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Mon, 13 May 2024 20:26:32 +0800 Subject: [PATCH 5/6] thermal: Update VDisplay - Update vskin outer display equation - Add vskin inner display = vskin open Bug: 318451991 Test: Local build and verify Change-Id: I05fa690fae1d14bf1db9b578529e3cdcf955e467 --- thermal/thermal_info_config_comet.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 290607c..0043525 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -676,11 +676,28 @@ { "Name": "VIRTUAL-SKIN-OUTER-DISPLAY", "Type": "DISPLAY", + "Version": "2.0", + "VirtualSensor": true, + "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], + "Formula": "MAXIMUM", + "Combination": ["display_therm"], + "Coefficient": [0.956], + "Offset": 1102, + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier": 0.001, + "SendCallback": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "VIRTUAL-SKIN-INNER-DISPLAY", + "Type": "DISPLAY", "Version": "1.0", "VirtualSensor": true, "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN"], + "Combination": ["VIRTUAL-SKIN-OPEN"], "Coefficient": [1.0], "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], From a6a413a7eef4d3e830e58e52aa72ea768791c624 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 16 May 2024 09:54:28 +0000 Subject: [PATCH 6/6] [Thread] remove duplicate service Bug: 333516795 Test: build pass Change-Id: Ic1887cb8f78f9aedc78c93a6049db49527fb6531 --- device-comet.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-comet.mk b/device-comet.mk index e44647a..66dc54c 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -451,10 +451,6 @@ PRODUCT_COPY_FILES += \ # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true -# Thread HAL -PRODUCT_PACKAGES += \ - com.google.comet.hardware.threadnetwork - # ETM ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)