diff --git a/OWNERS b/OWNERS index 5aee848..61b3e45 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +1,4 @@ per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index c270ed8..f91a44d 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -206,25 +206,25 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -235,9 +235,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index ddf3a1a..bc18a46 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -185,11 +185,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -200,9 +200,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 43c5c12..90e4a16 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index 1455600..a96e6b3 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -196,21 +196,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -221,9 +221,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..e3f27d9 100644 --- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index d877752..ef5d770 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -148,6 +148,7 @@ + @@ -382,6 +383,10 @@ + + + + @@ -396,6 +401,10 @@ + + + + @@ -602,6 +611,10 @@ + + + + @@ -610,6 +623,10 @@ + + + + > diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index c270ed8..f91a44d 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -206,25 +206,25 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -235,9 +235,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index ddf3a1a..bc18a46 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -185,11 +185,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -200,9 +200,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 43c5c12..90e4a16 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index 1455600..a96e6b3 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -196,21 +196,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -221,9 +221,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index d877752..ef5d770 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -148,6 +148,7 @@ + @@ -382,6 +383,10 @@ + + + + @@ -396,6 +401,10 @@ + + + + @@ -602,6 +611,10 @@ + + + + @@ -610,6 +623,10 @@ + + + + > diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 1437c49..a09cbae 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -32,7 +32,7 @@ on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root group root system @@ -66,11 +66,3 @@ on property:persist.vendor.se.ese2.mode=ctsmode on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 - -# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints -on property:sys.boot_completed=1 - trigger override-sf-uclamp - -on override-sf-uclamp - write /proc/vendor_sched/rt_uclamp_min 0 - write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/conf/init.slider.rc b/conf/init.slider.rc index 3042b5b..af4a484 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -20,7 +20,7 @@ on early-boot start insmod_sh_slider -service insmod_sh_slider /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.slider.cfg +service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg class main user root group root system diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc index c030ad7..8894c75 100644 --- a/conf/init.whitefin.rc +++ b/conf/init.whitefin.rc @@ -14,7 +14,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_whitefin -service insmod_sh_whitefin /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.whitefin.cfg +service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg class main user root group root system diff --git a/device-oriole.mk b/device-oriole.mk index b4a772c..2184715 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -33,7 +33,8 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk @@ -89,8 +90,18 @@ PRODUCT_PACKAGES_DEBUG += \ sar_test \ hci_inject -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml +# userdebug specific +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +# Bluetooth LE Audio Hardware offload +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=true \ + persist.bluetooth.le_audio_test=false +endif + +# Bluetooth HAL +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # MIPI Coex Configs PRODUCT_COPY_FILES += \ @@ -171,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ @@ -200,7 +211,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts @@ -213,12 +225,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf -PRODUCT_COPY_FILES += \ - device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -239,15 +245,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 -# userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -# Bluetooth LE Audio Hardware offload -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=false -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true @@ -263,20 +260,19 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false - -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-raven.mk b/device-raven.mk index e0b16f3..c0f34d3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -32,7 +32,9 @@ include device/google/raviole/audio/raven/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/lsi/lsi.mk + ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk @@ -76,6 +78,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/powerhint-raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json +PRODUCT_PACKAGES += \ + UwbOverlayR4 + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ @@ -88,14 +93,23 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv +# Bluetooth HAL +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # Bluetooth Hal Extension test tools PRODUCT_PACKAGES_DEBUG += \ sar_test \ hci_inject -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml +# userdebug specific +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +# Bluetooth LE Audio Hardware offload +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=true \ + persist.bluetooth.le_audio_test=false +endif # MIPI Coex Configs PRODUCT_COPY_FILES += \ @@ -180,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ @@ -207,7 +221,8 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # SKU specific RROs PRODUCT_PACKAGES += \ @@ -226,12 +241,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf -PRODUCT_COPY_FILES += \ - device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -252,15 +261,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 -# userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -# Bluetooth LE Audio Hardware offload -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=false -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true @@ -276,23 +276,22 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false - -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120 # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-slider.mk b/device-slider.mk index 07834b4..5cbab35 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -27,16 +27,15 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/gps/brcm/cbd_gps.mk +include device/google/gs-common/touch/stm/stm11.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc @@ -107,10 +106,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -125,3 +120,13 @@ PRODUCT_SHIPPING_API_LEVEL := 31 # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/device-whitefin.mk b/device-whitefin.mk index 41f5da2..0c366c8 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -27,16 +27,19 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/gps/brcm/cbd_gps.mk +include device/google/gs-common/touch/lsi/lsi.mk + +# wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder +PRODUCT_PACKAGES += vendor.google.wireless_charger-default +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc @@ -86,10 +89,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -104,3 +103,13 @@ PRODUCT_SHIPPING_API_LEVEL := 31 # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/location/gps.xml b/location/gps.xml new file mode 100644 index 0000000..fb1c305 --- /dev/null +++ b/location/gps.xml @@ -0,0 +1,100 @@ + + + + + + + + + + diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole new file mode 100644 index 0000000..fc42089 --- /dev/null +++ b/location/gps.xml.oriole @@ -0,0 +1,100 @@ + + + + + + + + + + diff --git a/location/gps.xml.raven b/location/gps.xml.raven new file mode 100644 index 0000000..555e9ba --- /dev/null +++ b/location/gps.xml.raven @@ -0,0 +1,100 @@ + + + + + + + + + + diff --git a/location/gps_user.xml b/location/gps_user.xml new file mode 100644 index 0000000..0584d48 --- /dev/null +++ b/location/gps_user.xml @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole new file mode 100644 index 0000000..9abad36 --- /dev/null +++ b/location/gps_user.xml.oriole @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven new file mode 100644 index 0000000..9ef4706 --- /dev/null +++ b/location/gps_user.xml.raven @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml deleted file mode 100644 index e7ecfd9..0000000 --- a/media_codecs_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index dc1db0c..e3d7efc 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -13,8 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk + +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + +ifdef AUTOMOTIVE_PRODUCT_PATH + #RBC# include_top device/google/auto_tcu + #RBC# include_top device/google/pixel_tcu + #RBC# include_top device/google_car + include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk else TARGET_SCREEN_DENSITY := 420 endif diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 51afbd9..c280a88 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -224,9 +224,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - 64 - 2 3 @@ -328,9 +325,16 @@ --> true - - - com.facebook.orca - com.skype.raider - + + M 0 0 L 0 2399.9551 L 0.01171875 2330 C 0.01171875 2336.1175 0.0096285556 2342.2799 0.044921875 2347.9473 C 0.074333947 2353.2002 0.11155831 2357.9933 0.30273438 2362.5195 L 0.30273438 2362.5645 C 0.31743984 2362.9086 0.3319628 2363.2497 0.34960938 2363.5879 C 0.58196092 2368.429 1.0173528 2373.0871 2.3261719 2377.5664 C 2.6526417 2378.6869 3.0343994 2379.7897 3.4785156 2380.8691 C 3.922632 2381.9456 4.3891332 2382.9253 5.0214844 2384.0488 C 6.2861859 2386.2958 7.882405 2388.4107 9.7382812 2390.2695 C 11.5971 2392.1253 13.711934 2393.7216 15.958984 2394.9863 C 16.079572 2395.054 16.199726 2395.1205 16.320312 2395.1855 C 19.876184 2397.1207 23.827035 2398.2369 27.847656 2398.8633 C 29.224122 2399.078 30.608739 2399.2397 32.011719 2399.3691 C 33.461714 2399.4985 34.928774 2399.5862 36.414062 2399.6602 C 37.040534 2399.6902 37.670361 2399.7162 38.308594 2399.7402 C 38.967415 2399.7632 39.630196 2399.7847 40.300781 2399.8027 C 43.07136 2399.8798 45.970553 2399.9183 49.011719 2399.9453 C 50.008778 2399.9543 51.024293 2399.9568 52.056641 2399.9668 C 57.724269 2399.9998 63.882372 2400 70 2400 L 1010 2400 C 1016.1176 2400 1022.2758 2399.9998 1027.9434 2399.9668 C 1028.9758 2399.9568 1029.9913 2399.9543 1030.9883 2399.9453 C 1034.0295 2399.9183 1036.9286 2399.8798 1039.6992 2399.8027 C 1040.3698 2399.7847 1041.0326 2399.7632 1041.6914 2399.7402 C 1042.3297 2399.7162 1042.9594 2399.6902 1043.5859 2399.6602 C 1045.0712 2399.5862 1046.5383 2399.4985 1047.9883 2399.3691 C 1049.3913 2399.2397 1050.7759 2399.078 1052.1523 2398.8633 C 1056.173 2398.2369 1060.1239 2397.1207 1063.6797 2395.1855 C 1063.8003 2395.1205 1063.9204 2395.054 1064.041 2394.9863 C 1066.2881 2393.7216 1068.4029 2392.1253 1070.2617 2390.2695 C 1072.1176 2388.4107 1073.7138 2386.2958 1074.9785 2384.0488 C 1075.6109 2382.9253 1076.0774 2381.9456 1076.5215 2380.8691 C 1076.9656 2379.7897 1077.3474 2378.6869 1077.6738 2377.5664 C 1078.9827 2373.0871 1079.4181 2368.429 1079.6504 2363.5879 C 1079.6684 2363.2497 1079.6823 2362.9086 1079.6973 2362.5645 L 1079.6973 2362.5195 C 1079.8885 2357.9933 1079.9257 2353.2002 1079.9551 2347.9473 C 1079.9901 2342.2799 1079.9883 2336.1175 1079.9883 2330 L 1080 2399.9551 L 1080 0.044921875 L 1079.9883 71 C 1079.9883 64.794962 1079.9911 58.545473 1079.9551 52.796875 C 1079.9253 47.468905 1079.8873 42.606745 1079.6934 38.015625 L 1079.6934 37.970703 C 1079.6784 37.621663 1079.6625 37.274699 1079.6445 36.931641 C 1079.4088 32.021321 1078.9681 27.295335 1077.6406 22.751953 C 1077.3095 21.615355 1076.9211 20.497172 1076.4707 19.402344 C 1076.0202 18.310501 1075.5496 17.317311 1074.9082 16.177734 C 1073.6254 13.898585 1072.0054 11.75451 1070.123 9.8691406 C 1068.2376 7.9867504 1066.0917 6.3667538 1063.8125 5.0839844 C 1063.6902 5.0153714 1063.5696 4.9464892 1063.4473 4.8808594 C 1059.8406 2.9179242 1055.8339 1.7877614 1051.7559 1.1523438 C 1050.3597 0.93457112 1048.9542 0.7699316 1047.5312 0.63867188 C 1046.0607 0.50741114 1044.571 0.41832986 1043.0645 0.34375 C 1042.4291 0.31391006 1041.7919 0.28558871 1041.1445 0.26171875 C 1040.4763 0.23784879 1039.8052 0.21711871 1039.125 0.19921875 C 1036.3148 0.12165291 1033.3718 0.081537446 1030.2871 0.0546875 C 1029.2758 0.045737518 1028.2483 0.039203113 1027.2012 0.033203125 C 1021.4526 -0.0026068034 1015.205 0 1009 0 L 0 0 z M 1009 0 L 1080 0.044921875 L 1080 0 L 1009 0 z M 1080 2399.9551 L 1010 2400 L 1080 2400 L 1080 2399.9551 z M 70 2400 L 0 2399.9551 L 0 2400 L 70 2400 z M 71.074219 0.07421875 C 64.869196 0.07421875 58.623595 0.071623672 52.875 0.10742188 C 51.827904 0.11338786 50.798412 0.11995677 49.787109 0.12890625 C 46.702498 0.15575489 43.761331 0.19782787 40.951172 0.27539062 C 40.270961 0.2932897 39.597922 0.31402528 38.929688 0.33789062 C 38.282338 0.36175598 37.645185 0.38813701 37.009766 0.41796875 C 35.503258 0.49254831 34.013679 0.58163053 32.542969 0.71289062 C 31.119947 0.84415098 29.716443 1.00879 28.320312 1.2265625 C 24.242304 1.8619807 20.235577 2.9921432 16.628906 4.9550781 C 16.506596 5.0207081 16.384028 5.08959 16.261719 5.1582031 C 13.982566 6.4409722 11.836546 8.0609694 9.9511719 9.9433594 C 8.0687825 11.82873 6.4487846 13.972802 5.1660156 16.251953 C 4.5246312 17.39153 4.0539764 18.38472 3.6035156 19.476562 C 3.153055 20.571392 2.7647271 21.691531 2.4335938 22.828125 C 1.1060772 27.371513 0.66535899 32.095538 0.4296875 37.005859 C 0.41178834 37.348927 0.39577534 37.695889 0.38085938 38.044922 L 0.38085938 38.089844 C 0.18695251 42.680964 0.14897249 47.543126 0.11914062 52.871094 C 0.083342432 58.619688 0.0859375 64.869175 0.0859375 71.074219 L 0.07421875 0.11914062 L 71.074219 0.07421875 z diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..79347af --- /dev/null +++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,36 @@ + + + + + Alarm + + + Wifi + + + Cellular_data + + + Sound_trigger + + + Sensor + + + diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 2e0c18b..fa178a8 100644 --- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -50,9 +50,6 @@ 54px - - 0 - 16px diff --git a/oriole/overlay/packages/apps/Nfc/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml index 67075fd..d1f5832 100644 --- a/oriole/overlay/packages/apps/Nfc/res/values/config.xml +++ b/oriole/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,15 @@ GB7N6 GR1YH + true + + 72 + 157 + false + + 36 + + + 106 + diff --git a/powerhint-oriole.json b/powerhint-oriole.json index a356673..16a368f 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -131,19 +131,20 @@ "ResetOnInit": true }, { - "Name": "MIFTargetLoad", - "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", "Values": [ - "20 5 80", - "20 10 80" + "1280", + "1100" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -152,7 +153,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,8 +162,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -209,8 +210,7 @@ "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ "0-3", - "6-7", - "0-7" + "6-7" ], "ResetOnInit": true }, @@ -219,8 +219,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ "0-3", - "4-5", - "0-7" + "4-5" ], "ResetOnInit": true }, @@ -229,8 +228,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ "0-3", - "4-7", - "0-7" + "4-7" ], "ResetOnInit": true }, @@ -489,6 +487,16 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -550,13 +558,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -623,6 +631,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -665,18 +679,18 @@ "Duration": 1000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "4-7" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "NPITaskPacking", "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -923,12 +937,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "TAPreferHighCap", @@ -941,24 +949,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "NPITaskPacking", @@ -977,6 +967,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", @@ -1013,12 +1009,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "TAPreferHighCap", @@ -1031,24 +1021,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "NPITaskPacking", @@ -1103,30 +1075,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "NPITaskPacking", @@ -1187,30 +1135,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "NPITaskPacking", @@ -1453,353 +1377,383 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1864,7 +1818,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1886,8 +1840,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1910,8 +1864,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1934,8 +1888,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1961,9 +1915,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1985,9 +1939,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2009,7 +1963,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-raven.json b/powerhint-raven.json index ea95391..b0b22d8 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -130,19 +130,20 @@ "ResetOnInit": true }, { - "Name": "MIFTargetLoad", - "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", "Values": [ - "20 5 80", - "20 10 80" + "1280", + "1100" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -151,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -160,8 +161,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -208,8 +209,7 @@ "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ "0-3", - "6-7", - "0-7" + "6-7" ], "ResetOnInit": true }, @@ -218,8 +218,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ "0-3", - "4-5", - "0-7" + "4-5" ], "ResetOnInit": true }, @@ -228,8 +227,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ "0-3", - "4-7", - "0-7" + "4-7" ], "ResetOnInit": true }, @@ -488,6 +486,16 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -549,13 +557,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -622,6 +630,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -664,18 +678,18 @@ "Duration": 1000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "4-7" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "NPITaskPacking", "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -922,12 +936,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "TAPreferHighCap", @@ -940,24 +948,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "NPITaskPacking", @@ -976,6 +966,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", @@ -1012,12 +1008,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "TAPreferHighCap", @@ -1030,24 +1020,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "NPITaskPacking", @@ -1102,30 +1074,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "NPITaskPacking", @@ -1186,30 +1134,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "NPITaskPacking", @@ -1434,353 +1358,383 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1845,7 +1799,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1867,8 +1821,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1891,8 +1845,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1915,8 +1869,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1942,9 +1896,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1966,9 +1920,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1990,7 +1944,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-slider.json b/powerhint-slider.json index af20ff5..bd5ab4c 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -129,6 +129,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -142,9 +152,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +162,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +171,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +181,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -417,7 +427,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -429,7 +439,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -440,7 +450,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -464,13 +474,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -490,6 +500,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -832,6 +848,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", @@ -1196,13 +1218,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1213,7 +1235,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1348,7 +1370,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", @@ -1376,8 +1398,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1400,8 +1422,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1424,8 +1446,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1451,9 +1473,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1475,9 +1497,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1499,7 +1521,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 60c299f..cc335bc 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -129,6 +129,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -142,9 +152,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +162,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +171,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +181,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -408,7 +418,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -420,7 +430,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -431,7 +441,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -455,13 +465,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -481,6 +491,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -823,6 +839,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", @@ -1181,13 +1203,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1198,7 +1220,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1327,7 +1349,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" } ], "AdpfConfig": [ @@ -1343,8 +1365,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1367,8 +1389,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1391,8 +1413,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1418,9 +1440,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1442,9 +1464,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1466,7 +1488,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index b78d5b4..2217df1 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -14,8 +14,20 @@ # limitations under the License. # -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + +ifdef AUTOMOTIVE_PRODUCT_PATH + #RBC# include_top device/google/auto_tcu + #RBC# include_top device/google/pixel_tcu + #RBC# include_top device/google_car + include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk else TARGET_SCREEN_DENSITY := 560 endif diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 57b661d..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -200,9 +200,6 @@ false - - 64 - 2 3 @@ -304,9 +301,16 @@ --> true - - - com.facebook.orca - com.skype.raider - + + M 176 0 C 115.02392 1.1656472 102.53447 1.6184269 71.396484 3.3847656 C 55.659057 4.4652262 48.372167 5.3816761 40.939453 7.5957031 C 36.159471 9.0195457 30.970511 11.33647 26.369141 14.238281 C 22.479829 16.691042 19.646362 19.26924 16.513672 22.466797 C 12.640699 26.419964 10.129306 29.745868 8.1074219 34.291016 C 5.3985024 40.380603 4.5627354 44.599726 3.7597656 49.205078 C 1.5206876 62.047086 2.0426694 76.127341 1.3613281 93.833984 C 0.29502583 121.54496 0.79450661 135.72186 0 176 L 0 2944 C 0.79450661 2984.2782 0.29502583 2998.4569 1.3613281 3026.168 C 2.0426694 3043.8746 2.1114381 3057.8378 4.2636719 3070.748 C 4.8913915 3074.5134 6.5432868 3080.1477 9.0664062 3085.1855 C 11.294042 3089.6334 13.056713 3092.9239 16.929688 3096.877 C 20.062376 3100.0744 22.895844 3102.6546 26.785156 3105.1074 C 31.386528 3108.0092 36.774591 3110.4649 41.513672 3112.0195 C 47.497419 3113.9823 55.924021 3115.2717 71.396484 3116.6152 C 102.53447 3118.3815 115.02392 3118.8344 176 3120 L 1264 3120 C 1324.976 3118.8344 1337.4655 3118.3815 1368.6035 3116.6152 C 1384.076 3115.2717 1392.5025 3113.9823 1398.4863 3112.0195 C 1403.2253 3110.4649 1408.6134 3108.0092 1413.2148 3105.1074 C 1417.1041 3102.6546 1419.9376 3100.0744 1423.0703 3096.877 C 1426.9432 3092.9239 1428.704 3089.6334 1430.9316 3085.1855 C 1433.4548 3080.1477 1435.1086 3074.5134 1435.7363 3070.748 C 1437.8886 3057.8378 1437.9574 3043.8746 1438.6387 3026.168 C 1439.705 2998.4569 1439.2055 2984.2782 1440 2944 L 1440 176 C 1439.2055 135.72186 1439.705 121.54496 1438.6387 93.833984 C 1437.9574 76.12734 1438.4793 62.047092 1436.2402 49.205078 C 1435.4373 44.599728 1434.6015 40.380604 1431.8926 34.291016 C 1429.8707 29.745874 1427.3593 26.419959 1423.4863 22.466797 C 1420.3536 19.269233 1417.5202 16.691047 1413.6309 14.238281 C 1409.0295 11.336467 1403.8405 9.0195403 1399.0605 7.5957031 C 1391.628 5.3816775 1384.341 4.4652314 1368.6035 3.3847656 C 1337.4655 1.6184272 1324.976 1.1656476 1264 0 L 176 0 z diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..79347af --- /dev/null +++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,36 @@ + + + + + Alarm + + + Wifi + + + Cellular_data + + + Sound_trigger + + + Sensor + + + diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 6d0894d..bc7aab2 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -59,8 +59,5 @@ 68px - - - 0 diff --git a/raven/overlay/packages/apps/Nfc/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml index 2e8c8ca..e17a0a2 100644 --- a/raven/overlay/packages/apps/Nfc/res/values/config.xml +++ b/raven/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,15 @@ GF5KQ GLU0G + true + + 72 + 167 + false + + 36 + + + 106 + diff --git a/raven/rro_overlays/UwbOverlay/Android.bp b/raven/rro_overlays/UwbOverlay/Android.bp new file mode 100644 index 0000000..925ee77 --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/Android.bp @@ -0,0 +1,11 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "UwbOverlayR4", + theme: "UwbOverlayR4", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/raven/rro_overlays/UwbOverlay/AndroidManifest.xml b/raven/rro_overlays/UwbOverlay/AndroidManifest.xml new file mode 100644 index 0000000..57dfd5b --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/raven/rro_overlays/UwbOverlay/OWNERS b/raven/rro_overlays/UwbOverlay/OWNERS new file mode 100644 index 0000000..2395d7f --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/OWNERS @@ -0,0 +1,3 @@ +# People who can approve changes for submission +include platform/packages/modules/Uwb:/OWNERS +victorliu@google.com diff --git a/raven/rro_overlays/UwbOverlay/res/values/config.xml b/raven/rro_overlays/UwbOverlay/res/values/config.xml new file mode 100644 index 0000000..672ee1d --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/res/values/config.xml @@ -0,0 +1,31 @@ + + + + + true + + + true + + + true + diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk index 5ae0f03..835f6e8 100644 --- a/self-extractors_oriole/google_devices/staging/Android.mk +++ b/self-extractors_oriole/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -74,7 +74,7 @@ LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice +LOCAL_LICENSE_CONDITIONS := PRESIGNED LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE include $(BUILD_PREBUILT) diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk index f3ad011..d4e1289 100644 --- a/self-extractors_raven/google_devices/staging/Android.mk +++ b/self-extractors_raven/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -72,7 +72,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -88,7 +88,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := qorvo LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index d73d66a..1ec4b90 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -3,135 +3,49 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"], "Multiplier":0.001 }, { "Name":"rf1_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"rf2_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "35.0", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "35.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/usb_pwr_therm2/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -139,42 +53,15 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "32.9", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "32.9", "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/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -185,25 +72,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "gnss_tcxo_therm" - ], - "Coefficient":[ - "0.25", - "0.75" - ], + "Combination":["qi_therm", "gnss_tcxo_therm"], + "Coefficient":["0.25", "0.75"], "Offset":-4500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -212,24 +83,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "quiet_therm" - ], - "Coefficient":[ - "0.25", - "0.75" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["qi_therm", "quiet_therm"], + "Coefficient":["0.25", "0.75"], "Multiplier":0.001 }, { @@ -238,25 +93,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "battery" - ], - "Coefficient":[ - "0.22", - "0.78" - ], + "Combination":["qi_therm", "battery"], + "Coefficient":["0.22", "0.78"], "Offset":-500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -265,25 +104,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "disp_therm" - ], - "Coefficient":[ - "0.16", - "0.84" - ], + "Combination":["usb_pwr_therm2", "disp_therm"], + "Coefficient":["0.16", "0.84"], "Offset":1500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -292,25 +115,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "quiet_therm", - "battery" - ], - "Coefficient":[ - "2.15", - "-1.15" - ], + "Combination":["quiet_therm", "battery"], + "Coefficient":["2.15", "-1.15"], "Offset":-2000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -319,93 +126,153 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-QUIET", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "43.0", - "45.0", - "46.5", - "52.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.4, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "37.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -416,37 +283,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-BATT", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "41.0", - "43.0", - "45.0", - "47.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-BATT", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "41.0", "43.0", "45.0", "47.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, @@ -454,7 +294,7 @@ { "CdevRequest": "fcc", "LimitInfo": [0, 2, 3, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -463,7 +303,7 @@ { "CdevRequest": "dc_icl", "LimitInfo": [0, 1, 2, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -472,7 +312,7 @@ { "CdevRequest": "wlc_fcc", "LimitInfo": [0, 2, 2, 4, 5, 5, 5], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -486,37 +326,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-QUIET", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "54.0", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.9, - 0.0 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "Monitor":true, "PollingDelay":300000, @@ -528,24 +341,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "usb_pwr_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "usb_pwr_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -554,24 +351,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "qi_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "qi_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -581,32 +362,15 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "35000", - "2000", - "10000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["35000", "2000", "10000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", "LimitInfo": [0, 0, 0, 0, 1, 1, 1] } ], - "VrThreshold":"NAN", "Multiplier":1, "PollingDelay":60000, "PassiveDelay":7000 @@ -617,26 +381,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "35000", - "3000", - "12000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["35000", "3000", "12000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, "PollingDelay":60000, @@ -705,16 +452,6 @@ { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -724,26 +461,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -753,26 +473,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -780,41 +483,15 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], "Multiplier":1, "Hidden":true }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -835,25 +512,8 @@ { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -874,25 +534,8 @@ { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -913,25 +556,8 @@ { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -952,200 +578,64 @@ { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, @@ -1221,19 +711,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1243,33 +733,57 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "VSYS_PWR_MODEM", - "S2M_VDD_CPUCL2", - "S3M_VDD_CPUCL1", - "S4M_VDD_CPUCL0", - "S5M_VDD_INT", - "S1M_VDD_MIF", - "S2S_VDD_G3D" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0" - ], + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":["1.0", "1.0", "1.0", "1.0", "1.0", "1.0", "1.0"], "PowerSampleDelay":14000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-QI-GNSS", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index bb7af7b..139bc22 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -3,119 +3,43 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"], "Multiplier":0.001 }, { "Name":"rf1_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"rf2_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "32.2", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "32.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/quiet_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -123,42 +47,15 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "40.0", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "40.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/usb_pwr_therm2/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -166,17 +63,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -185,25 +72,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "neutral_therm", - "qi_therm" - ], - "Coefficient":[ - "0.6", - "0.4" - ], + "Combination":["neutral_therm", "qi_therm"], + "Coefficient":["0.6", "0.4"], "Offset":-3000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -212,25 +83,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "battery" - ], - "Coefficient":[ - "0.05", - "0.95" - ], + "Combination":["usb_pwr_therm2", "battery"], + "Coefficient":["0.05", "0.95"], "Offset":1000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -239,25 +94,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "gnss_tcxo_therm", - "battery" - ], - "Coefficient":[ - "0.50", - "0.50" - ], + "Combination":["gnss_tcxo_therm", "battery"], + "Coefficient":["0.5", "0.5"], "Offset":1500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -266,25 +105,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "disp_therm" - ], - "Coefficient":[ - "0.15", - "0.85" - ], + "Combination":["qi_therm", "disp_therm"], + "Coefficient":["0.15", "0.85"], "Offset":2000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -293,93 +116,153 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39", - "43", - "45", - "46.5", - "52.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.4, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "37.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -390,37 +273,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "41.0", - "43.0", - "45.0", - "47.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "41.0", "43.0", "45.0", "47.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, @@ -428,7 +284,7 @@ { "CdevRequest": "fcc", "LimitInfo": [0, 2, 3, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -437,7 +293,7 @@ { "CdevRequest": "dc_icl", "LimitInfo": [0, 1, 2, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -446,7 +302,7 @@ { "CdevRequest": "wlc_fcc", "LimitInfo": [0, 3, 3, 4, 5, 5, 5], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -460,37 +316,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "54.0", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.9, - 0.0 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "Monitor":true, "PollingDelay":300000, @@ -502,24 +331,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "usb_pwr_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "usb_pwr_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -528,24 +341,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "qi_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "qi_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -555,32 +352,15 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "40000", - "4500", - "9000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["40000", "4500", "9000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", "LimitInfo": [0, 0, 0, 0, 1, 1, 1] } ], - "VrThreshold":"NAN", "Multiplier":1, "PollingDelay":60000, "PassiveDelay":7000 @@ -591,26 +371,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "40000", - "5000", - "12000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["40000", "5000", "12000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, "PollingDelay":60000, @@ -679,16 +442,6 @@ { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -698,26 +451,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -727,26 +463,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -754,41 +473,15 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], "Multiplier":1, "Hidden":true }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -804,36 +497,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 6, 6, 6] } - ] + ] }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -843,36 +519,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 3, 3, 3] } - ] + ] }, { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -882,36 +541,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 6, 6, 6] } - ] + ] }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -926,200 +568,64 @@ { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, @@ -1144,29 +650,25 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"], - "PowerRail":"S4M_VDD_CPUCL0" + "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"], - "PowerRail":"S3M_VDD_CPUCL1" + "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"], - "PowerRail":"S2M_VDD_CPUCL2" + "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"] }, { "Name":"thermal-gpufreq-0", "Type":"GPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"], - "PowerRail":"S2S_VDD_G3D" + "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"] }, { "Name":"fcc", @@ -1199,19 +701,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1221,33 +723,53 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "VSYS_PWR_MODEM", - "S2M_VDD_CPUCL2", - "S3M_VDD_CPUCL1", - "S4M_VDD_CPUCL0", - "S5M_VDD_INT", - "S1M_VDD_MIF", - "S2S_VDD_G3D" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0" - ], + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":["1.0", "1.0", "1.0", "1.0", "1.0", "1.0", "1.0"], "PowerSampleDelay":14000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-NEUTRAL-QI", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-GNSS-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 12b7f47..569b0a9 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x4B4B234B ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x4B4B234B ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x53532B53 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x53532B53 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 25b1bb1..0e5b153 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 25b1bb1..0e5b153 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 9dfc069..550519d 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x01 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -110,6 +103,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x01 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 681a5f3..46aba9a 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0xffff +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 7bd68dc..a5e88b1 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 47d917c..b4047cd 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,22 +1,15 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 @@ -139,4 +133,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 -alternate_pulse_shape=0x01 +alternate_pulse_shape=0x00