diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml index 8fb572a..84ee3a5 100644 --- a/audio/cheetah/config/audio_platform_configuration.xml +++ b/audio/cheetah/config/audio_platform_configuration.xml @@ -242,6 +242,8 @@ + + diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index 98467c4..2180a8a 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -202,7 +202,7 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + + diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml index 8fb572a..84ee3a5 100644 --- a/audio/panther/config/audio_platform_configuration.xml +++ b/audio/panther/config/audio_platform_configuration.xml @@ -242,6 +242,8 @@ + + diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml index 98467c4..2180a8a 100644 --- a/audio/panther/config/audio_policy_configuration.xml +++ b/audio/panther/config/audio_policy_configuration.xml @@ -202,7 +202,7 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + + diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml similarity index 100% rename from bluetooth/cheetah/le_audio_codec_capabilities.xml rename to bluetooth/le_audio_codec_capabilities.xml diff --git a/bluetooth/panther/le_audio_codec_capabilities.xml b/bluetooth/panther/le_audio_codec_capabilities.xml deleted file mode 100644 index a836273..0000000 --- a/bluetooth/panther/le_audio_codec_capabilities.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml b/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml deleted file mode 100644 index 9e75363..0000000 --- a/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 8fb9fd2..bc57313 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -61,7 +61,7 @@ M 653,0 h 145 - v 130 + v 144 h -145 Z @left diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml index ee3f9c7..c99f6cc 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -30,7 +30,7 @@ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. --> 28dp - 130px + 144px 28dp diff --git a/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png index 4de2fbf..e6b6cea 100644 Binary files a/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png and b/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png differ diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index 6aa776d..b6f52e6 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -147,4 +147,7 @@ true + + + true diff --git a/device-cheetah.mk b/device-cheetah.mk index 7794bc3..7e4bec7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -91,6 +91,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1080x2340@120 +# TODO: b/250788756 - the property will be phased out after HWC loads user-preferred mode +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.preferred_mode=1080x2340@120 # NFC PRODUCT_COPY_FILES += \ @@ -186,6 +188,10 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# optimize spatializer effect +PRODUCT_PROPERTY_OVERRIDES += \ + audio.spatializer.effect.util_clamp_min=300 + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -266,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=11 + ro.vendor.build.svn=14 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -294,7 +300,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ - device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ @@ -346,6 +352,11 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false +# The default value of this variable is false and should only be set to true when +# the device allows users to enable the seamless transfer feature. +PRODUCT_PRODUCT_PROPERTIES += \ + euicc.seamless_transfer_enabled_in_non_qs=true + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-panther.mk b/device-panther.mk index 8433f30..1cd0b42 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -169,6 +169,10 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# optimize spatializer effect +PRODUCT_PROPERTY_OVERRIDES += \ + audio.spatializer.effect.util_clamp_min=300 + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -253,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=11 + ro.vendor.build.svn=14 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -282,7 +286,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ - device/google/pantah/bluetooth/panther/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ @@ -332,6 +336,11 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false +# The default value of this variable is false and should only be set to true when +# the device allows users to enable the seamless transfer feature. +PRODUCT_PRODUCT_PROPERTIES += \ + euicc.seamless_transfer_enabled_in_non_qs=true + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/location/gps.xml b/location/gps.xml index ab21290..f43535b 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 7dd2e8d..6c88903 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 2396a74..f6dcd8c 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 87b789d..17fd70a 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 7daeba3..300b9d8 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 9becbf6..f9a1c99 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/manifest.xml b/manifest.xml index d41ea1e..75aa800 100644 --- a/manifest.xml +++ b/manifest.xml @@ -125,7 +125,7 @@ vendor.google.whitechapel.audio.audioext hwbinder - 3.0 + 4.0 IAudioExt default diff --git a/panther/overlay/frameworks/base/core/res/res/values/bools.xml b/panther/overlay/frameworks/base/core/res/res/values/bools.xml deleted file mode 100644 index 9e75363..0000000 --- a/panther/overlay/frameworks/base/core/res/res/values/bools.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 9369361..30a508b 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -60,7 +60,7 @@ M 480,0 h 145 - v 118 + v 136 h -145 Z @left diff --git a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml index 9051ca3..a388c76 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -30,7 +30,7 @@ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. --> 28dp - 118px + 136px 28dp diff --git a/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png index 52c2e93..54d16e6 100644 Binary files a/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png and b/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png differ diff --git a/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png index 9ed11f6..d954f18 100644 Binary files a/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png and b/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png differ diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 9682014..dac7453 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -148,4 +148,7 @@ true + + + true diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 618dca2..7a37158 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -207,24 +207,17 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ + "0-3", "4-7", "0-7" ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ + "0-3", "6-7", "0-7" ], @@ -234,6 +227,7 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ + "0-3", "4-5", "0-7" ], @@ -243,6 +237,7 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -321,6 +316,16 @@ ], "Type": "Property" }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -558,14 +563,6 @@ ], "DefaultIndex": 0 }, - { - "Name": "PMU_MID_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency", - "Values": [ - "1836000" - ], - "DefaultIndex": 0 - }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", @@ -613,6 +610,30 @@ } ], "Actions": [ + { + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -661,6 +682,41 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -721,6 +777,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -745,6 +807,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -766,21 +834,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", @@ -1033,6 +1113,12 @@ "Duration": 3000, "Value": "848000" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", @@ -1107,7 +1193,7 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", + "Node": "PowerHALCameraRunning", "Duration": 0, "Value": "1" }, @@ -1123,12 +1209,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_MID_LIMIT_FREQ", - "Duration": 0, - "Value": "1836000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_LCPI_THRESHOLD", @@ -1159,6 +1239,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1225,6 +1311,66 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LIMIT_FREQ", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "EM_Profile", + "Duration": 0, + "Value": "cam1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1237,24 +1383,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1826000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1491000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1401000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -1291,6 +1419,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -1363,6 +1497,26 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", @@ -1811,18 +1965,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index ee5c42a..7223fa2 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -136,15 +136,6 @@ ], "ResetOnInit": true }, - { - "Name": "UClampThreshold", - "Path": "/proc/vendor_sched/uclamp_threshold", - "Values": [ - "0", - "8" - ], - "ResetOnInit": true - }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -233,6 +224,7 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -242,6 +234,7 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ + "0-3", "6-7", "0-7" ], @@ -251,6 +244,7 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ + "0-3", "4-5", "0-7" ], @@ -260,6 +254,7 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -338,6 +333,16 @@ ], "Type": "Property" }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -555,14 +560,6 @@ ], "DefaultIndex": 0 }, - { - "Name": "PMU_MID_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency", - "Values": [ - "1836000" - ], - "DefaultIndex": 0 - }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", @@ -633,10 +630,28 @@ ], "Actions": [ { - "PowerHint": "LAUNCH", - "Node": "UClampThreshold", - "Duration": 5000, - "Value": "0" + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" }, { "PowerHint": "LAUNCH", @@ -703,6 +718,64 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_EXTEND" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -763,6 +836,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -787,6 +866,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -808,21 +893,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", @@ -1075,6 +1172,12 @@ "Duration": 3000, "Value": "848000" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", @@ -1149,7 +1252,7 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", + "Node": "PowerHALCameraRunning", "Duration": 0, "Value": "1" }, @@ -1165,12 +1268,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_MID_LIMIT_FREQ", - "Duration": 0, - "Value": "1836000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_LCPI_THRESHOLD", @@ -1201,6 +1298,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1267,6 +1370,66 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LIMIT_FREQ", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "EM_Profile", + "Duration": 0, + "Value": "cam1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1279,24 +1442,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1826000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1491000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1401000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -1333,6 +1478,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -1405,6 +1556,26 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index acd02db..c638dd5 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -196,24 +196,17 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ + "0-3", "4-7", "0-7" ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ + "0-3", "6-7", "0-7" ], @@ -223,6 +216,7 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ + "0-3", "4-5", "0-7" ], @@ -232,6 +226,7 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -310,6 +305,16 @@ ], "Type": "Property" }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -547,14 +552,6 @@ ], "DefaultIndex": 0 }, - { - "Name": "PMU_MID_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency", - "Values": [ - "1836000" - ], - "DefaultIndex": 0 - }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", @@ -602,6 +599,30 @@ } ], "Actions": [ + { + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -650,6 +671,41 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -710,6 +766,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -734,6 +796,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -755,21 +823,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", @@ -920,6 +1000,12 @@ "Duration": 3000, "Value": "848000" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", @@ -994,7 +1080,7 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", + "Node": "PowerHALCameraRunning", "Duration": 0, "Value": "1" }, @@ -1010,12 +1096,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_MID_LIMIT_FREQ", - "Duration": 0, - "Value": "1836000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_LCPI_THRESHOLD", @@ -1046,6 +1126,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1112,6 +1198,66 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LIMIT_FREQ", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "EM_Profile", + "Duration": 0, + "Value": "cam1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1124,24 +1270,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1826000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1491000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1401000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -1178,6 +1306,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -1250,6 +1384,26 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", @@ -1698,18 +1852,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ diff --git a/powerhint-panther.json b/powerhint-panther.json index 135419d..3c1b93c 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -117,16 +117,7 @@ "ResetOnInit": true }, { - "Name": "UClampThreshold", - "Path": "/proc/vendor_sched/uclamp_threshold", - "Values": [ - "0", - "8" - ], - "ResetOnInit": true - }, - { - "Name": "ReduceRreferIdle", + "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", "Values": [ "0", @@ -213,6 +204,7 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -222,6 +214,7 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ + "0-3", "6-7", "0-7" ], @@ -231,6 +224,7 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ + "0-3", "4-5", "0-7" ], @@ -240,6 +234,7 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -318,6 +313,16 @@ ], "Type": "Property" }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -535,14 +540,6 @@ ], "DefaultIndex": 0 }, - { - "Name": "PMU_MID_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency", - "Values": [ - "1836000" - ], - "DefaultIndex": 0 - }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", @@ -613,14 +610,32 @@ ], "Actions": [ { - "PowerHint": "LAUNCH", - "Node": "UClampThreshold", - "Duration": 5000, - "Value": "0" + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" }, { "PowerHint": "LAUNCH", - "Node": "ReduceRreferIdle", + "Node": "ReducePreferIdle", "Duration": 5000, "Value": "0" }, @@ -672,6 +687,64 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_EXTEND" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -732,6 +805,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -756,6 +835,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -777,21 +862,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", @@ -942,6 +1039,12 @@ "Duration": 3000, "Value": "848000" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", @@ -1016,7 +1119,7 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", + "Node": "PowerHALCameraRunning", "Duration": 0, "Value": "1" }, @@ -1032,12 +1135,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_MID_LIMIT_FREQ", - "Duration": 0, - "Value": "1836000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_LCPI_THRESHOLD", @@ -1068,6 +1165,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1134,6 +1237,66 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_MID_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LIMIT_FREQ", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_LCPI_THRESHOLD", + "Duration": 0, + "Value": "3" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_BIG_SPC_THRESHOLD", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "EM_Profile", + "Duration": 0, + "Value": "cam1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1146,24 +1309,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1826000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1491000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1401000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -1200,6 +1345,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -1272,6 +1423,26 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index db7f985..7a2dd16 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -377,31 +377,31 @@ { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"BIG", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 57174cf..b9bf892 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -377,31 +377,31 @@ { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"BIG", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 }, { diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 3c4204e..e123728 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -150,3 +150,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 45f9e02..4affed8 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -150,3 +150,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 45f9e02..4affed8 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -150,3 +150,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 7784b8c..3732304 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -150,3 +150,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index aabba6f..e7e7863 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -150,3 +150,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf new file mode 100644 index 0000000..a1e9de1 --- /dev/null +++ b/uwb/UWB-calibration.conf @@ -0,0 +1,153 @@ +[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]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +ant0.ch5.prf16.ant_delay=16447 +ant0.ch5.prf16.tx_power=0x67672F67 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x26 +ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.tx_power=0x67672F67 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x26 +ant0.ch9.prf16.ant_delay=16409 +ant0.ch9.prf16.tx_power=0x5F5F2F5F +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x26 +ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.tx_power=0x5F5F2F5F +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x26 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16465 +ant1.ch5.prf16.tx_power=0 +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0 +ant1.ch5.prf64.ant_delay=16465 +ant1.ch5.prf64.tx_power=0 +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0 +ant1.ch9.prf16.ant_delay=16414 +ant1.ch9.prf16.tx_power=0x47472347 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0x26 +ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.tx_power=0x47472347 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0x26 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16450 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16450 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16450 +ant2.ch9.prf16.tx_power=0 +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0 +ant2.ch9.prf64.ant_delay=16450 +ant2.ch9.prf64.tx_power=0 +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16450 +ant3.ch5.prf16.tx_power=0x2B2B172B +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0x20 +ant3.ch5.prf64.ant_delay=16450 +ant3.ch5.prf64.tx_power=0x2B2B172B +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0x20 +ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.tx_power=0 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.tx_power=0 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=-2520 +ant1.ant2.ch9.pdoa_offset=1874 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-3080 +ant1.ant3.ch9.pdoa_offset=3214 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5 +ant1.ant2.ch9.pdoa_lut=d7:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5 +ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a +ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09 +xtal_trim=23 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0 +[HAL]aoa_capability=2 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging=6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging=6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging=6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=4 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3 +[HAL]minimum_system_offset_uwbtime0=250 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 +alternate_pulse_shape=0x01 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index eb2bfe0..c5f4330 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -21,7 +21,7 @@ LOCAL_UWB_CAL_DIR=device/google/pantah/uwb PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ PRODUCT_COPY_FILES += \