diff --git a/Android.mk b/Android.mk index 447513b..fe8b5d6 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter sweet,$(TARGET_DEVICE)),) +ifneq ($(filter sweet_k6a,$(TARGET_DEVICE)),) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9b1e6a1..6fd9cf4 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,4 +5,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_sweet.mk + $(LOCAL_DIR)/lineage_sweet_k6a.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index dd6becc..9d16f3b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/xiaomi/sweet +DEVICE_PATH := device/xiaomi/sweet_k6a BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_DUP_SYSPROP := true @@ -27,14 +27,11 @@ TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76 # Assert -TARGET_OTA_ASSERT_DEVICE := sweet,sweetin +TARGET_OTA_ASSERT_DEVICE := sweet,sweetin,sweet_k6a # Audio AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true -# Bluetooth -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include - # Bootloader TARGET_NO_BOOTLOADER := true @@ -74,9 +71,12 @@ BOARD_KERNEL_SEPARATED_DTBO := true TARGET_KERNEL_CLANG_COMPILE := true TARGET_KERNEL_CONFIG := vendor/sweet_user_defconfig -TARGET_KERNEL_SOURCE := kernel/xiaomi/sweet +TARGET_KERNEL_SOURCE := kernel/xiaomi/sweet_k6a KERNEL_LD := LD=ld.lld +# Lineage Health +TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_BYPASS := false + # Manifest DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ $(DEVICE_PATH)/manifests/device_framework_matrix.xml \ @@ -136,8 +136,10 @@ BOARD_USES_QCOM_HARDWARE := true TARGET_BOARD_PLATFORM := sm6150 # Recovery +BOARD_INCLUDE_RECOVERY_DTBO := true TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888 +TARGET_USES_AOSP_RECOVERY := true # Releasetools TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH) @@ -150,10 +152,10 @@ BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public TARGET_SEPOLICY_DIR := msmsteppe --include device/qcom/sepolicy_vndr-legacy-um/SEPolicy.mk +-include device/qcom/sepolicy_vndr/SEPolicy.mk # Vendor security patch level -VENDOR_SECURITY_PATCH := 2022-07-01 +VENDOR_SECURITY_PATCH := 2023-03-01 # Verified Boot BOARD_AVB_ENABLE := true @@ -186,4 +188,7 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # inherit from the proprietary version --include vendor/xiaomi/sweet/BoardConfigVendor.mk +-include vendor/xiaomi/sweet_k6a/BoardConfigVendor.mk + +# Inherit from proprietary files for miuicamera +-include vendor/xiaomi/sweet_k6a-miuicamera/products/board.mk diff --git a/README.md b/README.md index 5c7fe9a..c65889d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ Copyright (C) 2021 - The LineageOS Project -Device tree for Xiaomi Redmi Note 10 Pro +Device tree for Xiaomi Redmi Note 12 Pro 4G ============== -The Xiaomi Redmi Note 10 Pro (codenamed "sweet / sweetin") are mid range smartphones from Xiaomi. +The Xiaomi Redmi Note 12 Pro 4G (codenamed "sweet_k6a) is mid range smartphones from Xiaomi. ## Device specifications @@ -13,17 +13,17 @@ Basic | Spec Sheet | Chipset | Qualcomm SM7150 Snapdragon 732G (8 nm) | | GPU | Adreno 618 | | Memory | 6/8 GB RAM | -| Shipped Android Version | 11 with MIUI 12 | -| Storage | 128 GB (UFS 2.2) | -| Battery | Non-removable Li-Po 5020 mAh | +| Shipped Android Version | 11 with MIUI 13 | +| Storage | 128/256 GB (UFS 2.2) | +| Battery | Non-removable Li-Po 5000 mAh | | Display | 1080 x 2400 pixels, 6.67 inches (~395 ppi pixel density) | -| Rear camera 1 | 64 MP, f/1.9, LED flash, HDR, panorama, 4K@30fps | -| Rear camera 2 | 8 MP, f/2.2, 118Ëš (ultrawide) | +| Rear camera 1 | 108 MP, f/1.9, LED flash, HDR, panorama, 4K@30fps | +| Rear camera 2 | 8 MP, f/2.2, 120Ëš (ultrawide) | | Rear camera 3 | 5 MP, f/2.4, (macro) | | Rear camera 4 | 2 MP, f/2.4, (depth) | -| Front Camera | 16 MP, f/2.5, Panorama, 1080p@30fps | -| Sensors | Fingerprint (side-mounted), accelerometer, gyro, proximity, compass | -| Release Date | March 2021 | +| Front Camera | 16 MP, f/2.4, Panorama, 1080p@30fps | +| Sensors | Fingerprint (side-mounted), accelerometer, gyro, ultrasound proximity, compass | +| Release Date | April 2023 | ## Device picture -![Xiaomi Redmi Note 10 Pro](https://i.imgur.com/t3byGh9.png "Xiaomi Redmi Note 10 Pro") +![Xiaomi Redmi Note 12 Pro 4G](https://i01.appmifile.com/v1/MI_18455B3E4DA706226CF7535A58E875F0267/pms_1681210731.51053703.png "Xiaomi Redmi Note 12 Pro 4G") diff --git a/configs/audio/a2dp_audio_policy_configuration.xml b/configs/audio/a2dp_audio_policy_configuration.xml deleted file mode 100644 index 7bcab5c..0000000 --- a/configs/audio/a2dp_audio_policy_configuration.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/audio/audio_io_policy.conf b/configs/audio/audio_io_policy.conf index 7e94df7..ee0d194 100644 --- a/configs/audio/audio_io_policy.conf +++ b/configs/audio/audio_io_policy.conf @@ -62,7 +62,7 @@ outputs { } direct_pcm_24 { flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT + formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 bit_width 24 app_type 69940 @@ -90,7 +90,7 @@ outputs { } compress_offload_24 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO + formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO sampling_rates 44100|48000|88200|96000|176400|192000 bit_width 24 app_type 69940 @@ -104,6 +104,18 @@ inputs { bit_width 16 app_type 69938 } + record_24bit { + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 24 + app_type 69948 + } + record_32bit { + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 32 + app_type 69949 + } record_compress_16 { flags AUDIO_INPUT_FLAG_COMPRESS formats AUDIO_FORMAT_PCM_16_BIT diff --git a/configs/audio/audio_platform_info_intcodec.xml b/configs/audio/audio_platform_info_intcodec.xml index 5b7ad81..fdfbc74 100644 --- a/configs/audio/audio_platform_info_intcodec.xml +++ b/configs/audio/audio_platform_info_intcodec.xml @@ -118,9 +118,13 @@ - + + + + + @@ -131,6 +135,23 @@ + + + + + + + + + + + + + + + + + @@ -141,48 +162,48 @@ - - - + + + - - - - - + + + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -218,6 +239,7 @@ + @@ -225,9 +247,9 @@ - - - + + + @@ -257,14 +279,18 @@ - - - - + + + + + + + + diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml index 755a1b6..7e967aa 100644 --- a/configs/audio/audio_policy_configuration.xml +++ b/configs/audio/audio_policy_configuration.xml @@ -239,9 +239,10 @@ - + + + + + + + + + + + + + + diff --git a/configs/audio/bluetooth_qti_audio_policy_configuration.xml b/configs/audio/bluetooth_qti_audio_policy_configuration.xml deleted file mode 100644 index f0b2506..0000000 --- a/configs/audio/bluetooth_qti_audio_policy_configuration.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/audio/mixer_paths_idp.xml b/configs/audio/mixer_paths_idp.xml index 881fd80..cc5339b 100644 --- a/configs/audio/mixer_paths_idp.xml +++ b/configs/audio/mixer_paths_idp.xml @@ -95,19 +95,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -150,7 +150,7 @@ - + @@ -441,13 +441,13 @@ - - - - - - - + + + + + + + @@ -459,8 +459,8 @@ - - + + @@ -474,98 +474,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -648,8 +648,8 @@ - - + + @@ -757,8 +757,10 @@ - - + + + + @@ -2051,6 +2053,8 @@ + + @@ -2435,16 +2439,6 @@ - - - - - - - - - - @@ -2731,10 +2725,6 @@ - - - - @@ -2830,9 +2820,6 @@ - - - @@ -2910,16 +2897,12 @@ - - - - - + @@ -2957,21 +2940,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3012,6 +2996,11 @@ + + + + + @@ -3024,6 +3013,11 @@ + + + + + @@ -3104,15 +3098,16 @@ - - - - - - - - - + + + + + + + + + + @@ -3227,6 +3222,10 @@ + + + + @@ -3464,7 +3463,7 @@ - + @@ -3524,6 +3523,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/audio/mixer_paths_overlay_static.xml b/configs/audio/mixer_paths_overlay_static.xml index 717f602..5c29a09 100644 --- a/configs/audio/mixer_paths_overlay_static.xml +++ b/configs/audio/mixer_paths_overlay_static.xml @@ -9,19 +9,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -35,13 +35,12 @@ + + + + + - - - - - - @@ -51,10 +50,13 @@ + + + - + @@ -62,105 +64,103 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + @@ -536,64 +536,69 @@ - - + + - - + + - - - - + - - + + - - - + + - + - - + + - - - + + - - - - - - + + + + + + + + + + + + + + + + @@ -605,14 +610,9 @@ - - - - - @@ -620,12 +620,48 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -696,68 +732,67 @@ - + - + - + - + - - + + - + - - + - + - + - + - + - + - + @@ -892,11 +927,11 @@ - + - + @@ -926,8 +961,6 @@ - - @@ -953,5 +986,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml deleted file mode 100644 index 8259125..0000000 --- a/configs/component-overrides.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/configs/gps/apdr.conf b/configs/gps/apdr.conf index ea2ec52..ce5ba78 100644 --- a/configs/gps/apdr.conf +++ b/configs/gps/apdr.conf @@ -24,73 +24,79 @@ # # + ###################################### # # -# QDR3 Configuration # +# Default Configuration # +# (GNSS only,QDR Disabled) # # # -# For QDR3, # -# comment default configuration above# -# and # -# uncomment below configuration # -# settings. # +# For QDR enablement, comment # +# this section and enabled # +# either QDR3 OR # +# QDR2-DWT OR QDR2-Gyro related # +# configuration section in below. # # # ###################################### -# + SENSOR_SERVICE = accel SENSOR_PROVIDER = native -SENSOR_RATE = 10 -SENSOR_SAMPLES = 10 -# -SENSOR_SERVICE = vehicle_speed -SENSOR_PROVIDER = native SENSOR_RATE = 100 SENSOR_SAMPLES = 1 -# + SENSOR_SERVICE = gyro SENSOR_PROVIDER = native -SENSOR_RATE = 10 -SENSOR_SAMPLES = 10 -# +SENSOR_RATE = 100 +SENSOR_SAMPLES = 1 + SENSOR_SERVICE = vehicle_gear SENSOR_PROVIDER = native SENSOR_RATE = 100 SENSOR_SAMPLES = 1 + + +###################################### +# # +# QDR3 Configuration # +# # +# For QDR3, # +# comment default configuration above# +# and # +# uncomment below configuration # +# settings. # +# # +###################################### # -SENSOR_SERVICE = accel_temp -SENSOR_PROVIDER = native -SENSOR_RATE = 1 -SENSOR_SAMPLES = 1 +#SENSOR_SERVICE = accel +#SENSOR_PROVIDER = native +#SENSOR_RATE = 10 +#SENSOR_SAMPLES = 10 # +#SENSOR_SERVICE = vehicle_speed +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +# +#SENSOR_SERVICE = gyro +#SENSOR_PROVIDER = native +#SENSOR_RATE = 10 +#SENSOR_SAMPLES = 10 # +#SENSOR_SERVICE = vehicle_gear +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +# +# +##Enable/disable sensor data flashback feature +#QDR_FLASHBACK_ENABLED = 0 ##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS -QDR_DYNAMIC_LOADING = 1 -##Specify CAN sensor type: Valid Options: 14(ODO), 2(ODO_DWT), 3(ODO_DWS) -QDR_CAN_TYPE = 14 +#QDR_DYNAMIC_LOADING = 1 +##Enable/disable sensor data batching feature +#QDR_BATCHING_ENABLED = 2 ##Reporting offset before PPS boundary -QDR_REPORTING_OFFSET = 20 -# - -##Vehicle Sensor Configuration (CAN data availability) -##QDR_VEH_SENSOR_CONFIG: -## 0: VEHICLE_SENSOR_PRESENT - Vehicle Sensor is available (DEFAULT) -## 1: VEHICLE_SENSOR_OPTIONAL - Vehicle Sensor may or may not be present. -#QDR_VEH_SENSOR_CONFIG = 0 - -##Select Wheel set (E.g.: Front two wheels, Rear two wheels OR All four wheels) -##To be used for differential wheel tick OR speed service. -##This configuration is applicable when QDR_CAN_TYPE configured as -##ODO_DWS(3) or ODO_DWT(2). -##Value "0": Use Front two wheels -##Value "1": Use Rear two wheels -##Value "2": Use All four wheels -#QG_DRIVE_WHEEL_FW_RW_AW = 2 -##Max Wheel tick value above which wheel tick rolls over -##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) -#QG_DWT_MAX_WHEEL_TICK_COUNT = 255.0 -##Configure Wheel constant for DWT based below equation -##(2 * pi * WHEEL_RADIUS / Pulses Per revolution) -##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) -#QG_DWT_WHEEL_CONSTANT = 0.044 +#QDR_REPORTING_OFFSET = 0 +##Sensor dispatch threshold declaration +#QDR_SENSDISPATCH_MS = 30 # ###################################### @@ -131,17 +137,33 @@ QDR_REPORTING_OFFSET = 20 #GNSS_MSR_STATISTIC_ENABLED = 3 #GNSS_MSR_STATISTIC_PRNTCNT = 10 # -##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS -#QDR_DYNAMIC_LOADING = 3 ##Enable/disable sensor data flashback feature #QDR_FLASHBACK_ENABLED = 0 +##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS +#QDR_DYNAMIC_LOADING = 3 ##Enable/disable sensor data batching feature #QDR_BATCHING_ENABLED = 0 ##Reporting offset before PPS boundary -#QDR_REPORTING_OFFSET = 20 +#QDR_REPORTING_OFFSET = 0 ##Sensor dispatch threshold declaration #QDR_SENSDISPATCH_MS = 30 - +##QDR_ENABLE_QG shall be set as 1 +#QDR_ENABLE_QG = 1 +##Select Wheel set (E.g.: Front two wheels, Rear two wheels OR All four wheels) +##To be used for differential wheel tick OR speed service. +##This configuration is applicable when QDR_CAN_TYPE configured as +##ODO_DWS(3) or ODO_DWT(2). +##Value "0": Use Front two wheels +##Value "1": Use Rear two wheels +##Value "2": Use All four wheels +#QG_DRIVE_WHEEL_FW_RW_AW = 2 +##Max Wheel tick value above which wheel tick rolls over +##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) +#QG_DWT_MAX_WHEEL_TICK_COUNT = 255.0 +##Configure Wheel constant for DWT based below equation +##(2 * pi * WHEEL_RADIUS / Pulses Per revolution) +##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) +#QG_DWT_WHEEL_CONSTANT = 0.044 ###################################### # # @@ -170,14 +192,14 @@ QDR_REPORTING_OFFSET = 20 #SENSOR_RATE = 100 #SENSOR_SAMPLES = 1 # -##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS -#QDR_DYNAMIC_LOADING = 2 ##Enable/disable sensor data flashback feature #QDR_FLASHBACK_ENABLED = 0 +##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS +#QDR_DYNAMIC_LOADING = 2 ##Enable/disable sensor data batching feature #QDR_BATCHING_ENABLED = 0 ##Reporting offset before PPS boundary -#QDR_REPORTING_OFFSET = 20 +#QDR_REPORTING_OFFSET = 0 ##Sensor dispatch threshold declaration #QDR_SENSDISPATCH_MS = 30 # diff --git a/configs/gps/gnss_antenna_info.conf b/configs/gps/gnss_antenna_info.conf new file mode 100644 index 0000000..e037daa --- /dev/null +++ b/configs/gps/gnss_antenna_info.conf @@ -0,0 +1,135 @@ +################################### +##### ANTENNA INFORMATION ##### +################################### + +################################### +# ANTENNA INFO VECTOR SIZE +################################### +# The number of antenna info +# structures in the vector. Each +# entry in this vector is a structure +# with the following elements: +# +# - CARRIER_FREQUENCY +# - PC_OFFSET +# - PC_VARIATION_CORRECTION +# - PC_VARIATION_CORRECTION_UNC +# - SIGNAL_GAIN_CORRECTION +# - SIGNAL_GAIN_CORRECTION_UNC +# +# Notes: +# CARRIER_FREQUENCY +# The carrier frequency in MHz. +# +# PC = PHASE CENTER +# PC_OFFSET is a structure with six +# elements: x, y, z and their associated uncertainties +# Phase center offset (PCO) is defined with +# respect to the origin of the Android sensor coordinate system, e.g., +# center of primary screen for mobiles +# +# PC_VARIATION_CORRECTION +# 2D vectors representing the phase center variation (PCV) corrections, +# in millimeters, at regularly spaced azimuthal angle (theta) and zenith angle +# (phi). The PCV correction is added to the phase measurement to obtain the +# corrected value. +# The azimuthal angle, theta, is defined with respect to the X axis of the +# Android sensor coordinate system, increasing toward the Y axis. The zenith +# angle, phi, is defined with respect to the Z axis of the Android Sensor +# coordinate system, increasing toward the X-Y plane. +# Each row vector (outer vectors) represents a fixed theta. The first row +# corresponds to a theta angle of 0 degrees. The last row corresponds to a +# theta angle of (360 - deltaTheta) degrees, where deltaTheta is the regular +# spacing between azimuthal angles, i.e., deltaTheta = 360 / (number of rows). +# The columns (inner vectors) represent fixed zenith angles, beginning at 0 +# degrees and ending at 180 degrees. They are separated by deltaPhi, the regular +# spacing between zenith angles, i.e., deltaPhi = 180 / (number of columns - 1). +# +# PC_VARIATION_CORRECTION_UNC +# 2D vectors of 1-sigma uncertainty in millimeters associated with the PCV +# correction values. +# +# SIGNAL_GAIN_CORRECTION +# 2D vectors representing the signal gain corrections at regularly spaced +# azimuthal angle (theta) and zenith angle (phi). The values are calculated or +# measured at the antenna feed point without considering the radio and receiver +# noise figure and path loss contribution, in dBi, i.e., decibel over isotropic +# antenna with the same total power. The signal gain correction is added the +# signal gain measurement to obtain the corrected value. +# The azimuthal angle, theta, is defined with respect to the X axis of the +# Android sensor coordinate system, increasing toward the Y axis. The zenith +# angle, phi, is defined with respect to the Z axis of the Android Sensor +# coordinate system, increasing toward the X-Y plane. +# Each row vector (outer vectors) represents a fixed theta. The first row +# corresponds to a theta angle of 0 degrees. The last row corresponds to a +# theta angle of (360 - deltaTheta) degrees, where deltaTheta is the regular +# spacing between azimuthal angles, i.e., deltaTheta = 360 / (number of rows). +# The columns (inner vectors) represent fixed zenith angles, beginning at 0 +# degrees and ending at 180 degrees. They are separated by deltaPhi, the regular +# spacing between zenith angles, i.e., deltaPhi = 180 / (number of columns - 1). +# +# SIGNAL_GAIN_CORRECTION_UNC +# 2D vectors of 1-sigma uncertainty in dBi associated with the signal +# gain correction values. +# +# The number of rows and columns could be the same for PC variation correction +# and signal gain corrections, or could be different +# If the former then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ are specified once +# only, if the latter then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ represent +# the number of rows/columns for PC variation correction and +# NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of +# rows/columns for signal gain corrections + +# ANTENNA_INFO_VECTOR_SIZE must be non zero if antenna corrections are sent +# ANTENNA_INFO_VECTOR_SIZE = 2 + +CARRIER_FREQUENCY_0 = 1575.42 + +PC_OFFSET_0 = 1.2 0.1 3.4 0.2 5.6 0.3 + +NUMBER_OF_ROWS_0 = 3 +NUMBER_OF_COLUMNS_0 = 4 + +PC_VARIATION_CORRECTION_0_ROW_0 = 11.22 33.44 55.66 77.88 +PC_VARIATION_CORRECTION_0_ROW_1 = 10.2 30.4 50.6 70.8 +PC_VARIATION_CORRECTION_0_ROW_2 = 12.2 34.4 56.6 78.8 + +PC_VARIATION_CORRECTION_UNC_0_ROW_0 = 0.1 0.2 0.3 0.4 +PC_VARIATION_CORRECTION_UNC_0_ROW_1 = 1.1 1.2 1.3 1.4 +PC_VARIATION_CORRECTION_UNC_0_ROW_2 = 2.1 2.2 2.3 2.4 + +SIGNAL_GAIN_CORRECTION_0_ROW_0 = 9.8 8.7 7.6 6.5 +SIGNAL_GAIN_CORRECTION_0_ROW_1 = 5.4 4.3 3.2 2.1 +SIGNAL_GAIN_CORRECTION_0_ROW_2 = 1.3 2.4 3.5 4.6 + +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_0 = 0.11 0.22 0.33 0.44 +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_1 = 0.55 0.66 0.77 0.88 +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_2 = 0.91 0.92 0.93 0.94 + + +CARRIER_FREQUENCY_1 = 1227.6 + +PC_OFFSET_1 = 3.4 0.2 5.6 0.3 1.2 0.1 + +NUMBER_OF_ROWS_1 = 4 +NUMBER_OF_COLUMNS_1 = 2 +NUMBER_OF_ROWS_SGC_1 = 3 +NUMBER_OF_COLUMNS_SGC_1 = 4 + +PC_VARIATION_CORRECTION_1_ROW_0 = 55.66 77.88 +PC_VARIATION_CORRECTION_1_ROW_1 = 11.22 33.44 +PC_VARIATION_CORRECTION_1_ROW_2 = 56.6 78.8 +PC_VARIATION_CORRECTION_1_ROW_3 = 12.2 34.4 + +PC_VARIATION_CORRECTION_UNC_1_ROW_0 = 0.3 0.4 +PC_VARIATION_CORRECTION_UNC_1_ROW_1 = 1.1 1.2 +PC_VARIATION_CORRECTION_UNC_1_ROW_2 = 2.1 2.2 +PC_VARIATION_CORRECTION_UNC_1_ROW_3 = 0.1 0.2 + +SIGNAL_GAIN_CORRECTION_1_ROW_0 = 7.6 6.5 5.4 4.3 +SIGNAL_GAIN_CORRECTION_1_ROW_1 = 1.3 2.4 9.8 8.7 +SIGNAL_GAIN_CORRECTION_1_ROW_2 = 1.4 2.5 3.6 4.7 + +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_0 = 0.91 0.92 0.55 0.66 +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_1 = 0.11 0.22 0.93 0.94 +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_2 = 0.95 0.96 0.33 0.44 diff --git a/configs/gps/gps.conf b/configs/gps/gps.conf index 00dcbe5..deea1c5 100644 --- a/configs/gps/gps.conf +++ b/configs/gps/gps.conf @@ -1,41 +1,58 @@ +#hardware/qcom/gps/loc_api/conf/gps.conf + +NI_SUPL_DENY_ON_NFW_LOCKED = 1 + +##################################### +# proxyAppPackageName +##################################### +# This is a string that is sent to the framework +# in nfwNotifyCb callback +# Add NFW package name +PROXY_APP_PACKAGE_NAME = com.motorola.nfwlocationattribution + +#Version check for XTRA +#DISABLE = 0 +#AUTO = 1 +#XTRA2 = 2 +#XTRA3 = 3 +XTRA_VERSION_CHECK=0 + # Error Estimate # _SET = 1 # _CLEAR = 0 ERR_ESTIMATE=0 #NTP server -NTP_SERVER=1.android.pool.ntp.org -NTP_SERVER_2=asia.pool.ntp.org -NTP_SERVER_3=0.cn.pool.ntp.org +NTP_SERVER=time.izatcloud.net #XTRA CA path -XTRA_CA_PATH=/usr/lib/ssl-1.1/certs +XTRA_CA_PATH=/usr/lib/ssl/certs # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose # If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 3 +DEBUG_LEVEL = 1 # Intermediate position report, 1=enable, 0=disable -INTERMEDIATE_POS=0 +#INTERMEDIATE_POS=0 # supl version 1.0 -SUPL_VER=0x20000 +#SUPL_VER=0x10000 # Emergency SUPL, 1=enable, 0=disable -SUPL_ES=0 +#SUPL_ES=1 #Choose PDN for Emergency SUPL #1 - Use emergency PDN #0 - Use regular SUPL PDN for Emergency SUPL -USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0 +#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0 #SUPL_MODE is a bit mask set in config.xml per carrier by default. #If it is uncommented here, this value will overwrite the value from #config.xml. #MSA=0X2 #MSB=0X1 -SUPL_MODE=3 +#SUPL_MODE= # GPS Capabilities bit mask # SCHEDULING = 0x01 @@ -43,11 +60,11 @@ SUPL_MODE=3 # MSA = 0x04 # ON_DEMAND_TIME = 0x10 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING -CAPABILITIES=0x17 +CAPABILITIES=0x77 # Accuracy threshold for intermediate positions # less accurate positions are ignored, 0 for passing all positions -ACCURACY_THRES=70 +# ACCURACY_THRES=5000 ################################ ##### AGPS server settings ##### @@ -74,72 +91,38 @@ ACCURACY_THRES=70 #AGPS_CERT_WRITABLE_MASK=0 #################################### -# LTE Positioning Profile Settings + # LTE Positioning Profile Settings #################################### -# LPP_PROFILE is a bit mask +# LPP_PROFILE is a bit mask(unit8 in HAL interface) # 0: Enable RRLP on LTE(Default) -# 1: Enable LPP_User_Plane on LTE -# 2: Enable LPP_Control_Plane -# 3: Enable both LPP_User_Plane and LPP_Control_Plane -LPP_PROFILE = 3 +# 0x01: LPP User Plane +# 0x02: LPP Control Plane +# 0x04: LPP User Plane for NR5G +# 0x08: LPP Control Plane for NR5G +# Mot modification +# 0x10: LPPe CP DBH +# 0x20: LPPe CP WLAN +# 0x40: LPPe UP DBH +# 0x80: LPPe UP WLAN +# TMO = 0x32 (50) LPP CP, RRLP UP, LPPe CP DBH & WLAN, LPPe CP UBP if product support pressure sensor +# ATT = 0x33 (51) LPP CP, LPP UP, LPPe CP DBH & WLAN, LPPe CP UBP if product support pressure sensor +# VzW = 0xF3 (243) LPP CP, LPP UP, LPPe CP DBH & WLAN, LPPe UP DBH & WLAN, LPPe CP & UP UBP if product support pressure sensor +#LPP_PROFILE = 2 #################################### #Datum Type #################################### # 0: WGS-84 # 1: PZ-90 -DATUM_TYPE = 0 +#DATUM_TYPE = 0 ################################ # EXTRA SETTINGS ################################ # NMEA provider (1=Modem Processor, 0=Application Processor) -NMEA_PROVIDER=0 - -################################ -# NMEA TAG BLOCK GROUPING -################################ -# NMEA tag block grouping is only applicable to GSA -# Default is disabled -# 0 - disabled -# 1 - enabled -NMEA_TAG_BLOCK_GROUPING_ENABLED = 0 - -# Customized NMEA GGA fix quality that can be used to tell -# whether SENSOR contributed to the fix. -# -# When this configuration item is not enabled (set to any value that is not 1), -# GGA fix quality conforms to NMEA standard spec as below: -# PPP/DGNSS/SBAS correction fix w/ or w/o sensor: 2 -# RTK fixed fix w/ or w/o sensor: 4 -# RTK float fix w/ or w/o sensor: 5 -# SPE fix w/ or w/o sensor: 1 -# Sensor dead reckoning fix: 6 -# -# When this configuration is enabled (set to 1), GGA fix quality -# will be output as below: -# PPP fix w/o sensor: 59, w/ sensor: 69 -# DGNSS/SBAS correction fix w/o sensor: 2, w/ sensor: 62 -# RTK fixed fix w/o sensor: 4, w/ sensor: 64 -# RTK float fix w/o sensor: 5, w/ sensor: 65, -# SPE fix w/o sensor: 1, and w/ sensor: 61 -# Sensor dead reckoning fix: 6 -# -# any value that is not 1 - disabled -# 1 - enabled -CUSTOM_NMEA_GGA_FIX_QUALITY_ENABLED = 0 - -################################ -# NMEA Reporting Rate Config, valid only when NMEA_PROVIDER is set to "0" -################################ -# NMEA Reporting Rate -# Set it to "1HZ" for 1Hz NMEA Reporting -# Set it to "NHZ" for NHz NMEA Reporting -#Default : NHZ (overridden by position update rate if set to lower rates) -NMEA_REPORT_RATE=NHZ - +#NMEA_PROVIDER=0 # Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE) -SGLTE_TARGET=0 +#SGLTE_TARGET=0 ################################################## # Select Positioning Protocol on A-GLONASS system @@ -147,8 +130,8 @@ SGLTE_TARGET=0 # 0x1: RRC CPlane # 0x2: RRLP UPlane # 0x4: LLP Uplane -A_GLONASS_POS_PROTOCOL_SELECT = 0xf - +#A_GLONASS_POS_PROTOCOL_SELECT = 0 +# ################################################## # Select technology for LPPe Control Plane ################################################## @@ -182,7 +165,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0xf # A_GLONASS_POS_PROTOCOL_SELECT # 0: disable # 1: enable -AGPS_CONFIG_INJECT = 1 +#AGPS_CONFIG_INJECT = 1 ################################################## # GNSS settings for automotive use cases @@ -196,7 +179,17 @@ AGPS_CONFIG_INJECT = 1 # default : 10 # AP time stamp uncertainty, until GNSS receiver # is able to acquire better timing information -AP_TIMESTAMP_UNCERTAINTY = 10 +#AP_TIMESTAMP_UNCERTAINTY = 10 + +################################################## +# QDR engine availability status +################################################## +# 0 : NO QDR (default) +# 1 : QDR enabled +# This settings enables QDR Configuration for +# automotive use case, if enabled then +# DR_AP_Service needs to be enabled in izat.conf +#EXTERNAL_DR_ENABLED = 0 ##################################### # DR_SYNC Pulse Availability @@ -206,22 +199,22 @@ AP_TIMESTAMP_UNCERTAINTY = 10 # This configuration enables the driver to make use # of PPS events generated by DR_SYNC pulse # Standard Linux PPS driver needs to be enabled -DR_SYNC_ENABLED = 0 +#DR_SYNC_ENABLED = 0 ##################################### # PPS Device name ##################################### -PPS_DEVICENAME = /dev/pps0 +#PPS_DEVICENAME = /dev/pps0 ##################################### # Ignore PPS at Startup and after long outage ##################################### -IGNORE_PPS_PULSE_COUNT = 1 +#IGNORE_PPS_PULSE_COUNT = 1 ##################################### # Long GNSS RF outage in seconds ##################################### -GNSS_OUTAGE_DURATION = 10 +#GNSS_OUTAGE_DURATION = 10 ##################################### # AP Clock Accuracy @@ -229,20 +222,20 @@ GNSS_OUTAGE_DURATION = 10 # Quality of APPS processor clock (in PPM). # Value specified is used for calculation of # APPS time stamp uncertainty -AP_CLOCK_PPM = 100 +#AP_CLOCK_PPM = 100 ##################################### # MAX ms difference to detect missing pulse ##################################### # Specifies time threshold in ms to validate any missing PPS pulses -MISSING_PULSE_TIME_DELTA = 900 +#MISSING_PULSE_TIME_DELTA = 900 ##################################### # Propagation time uncertainty ##################################### # This settings enables time uncertainty propagation # logic incase of missing PPS pulse -PROPAGATION_TIME_UNCERTAINTY = 1 +#PROPAGATION_TIME_UNCERTAINTY = 1 ####################################### # APN / IP Type Configuration @@ -300,100 +293,22 @@ MODEM_TYPE = 1 # 1 : enabled # This setting enables GPS engine to estimate clock # bias and drift when the signal from at least 1 -# SV is available and the UE’s position is known by +# SV is available and the UE’s position is known by # other position engines. #POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED = 0 -##################################### -# proxyAppPackageName -##################################### -# This is a string that is sent to the framework -# in nfwNotifyCb callback -PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation - ##################################### # CP_MTLR_ES ##################################### # CP MTLR ES, 1=enable, 0=disable -CP_MTLR_ES=0 +#CP_MTLR_ES=0 ################################################## # GNSS_DEPLOYMENT ################################################## # 0 : Enable QTI GNSS (default) # 1 : Enable QCSR SS5 -# 2 : Enable PDS API -# This setting use to select between QTI GNSS, -# QCSR SS5 hardware receiver, and PDS API. +# This setting use to select between QTI GNSS +# and QCSR SS5 hardware receiver. # By default QTI GNSS receiver is enabled. # GNSS_DEPLOYMENT = 0 - -################################################## -## LOG BUFFER CONFIGURATION -################################################## -#LOG_BUFFER_ENABLED, 1=enable, 0=disable -#*_LEVEL_TIME_DEPTH, maximum time depth of level * -#in log buffer, unit is second -#*_LEVEL_MAX_CAPACITY, maximum numbers of level * -#log print sentences in log buffer -LOG_BUFFER_ENABLED = 0 -E_LEVEL_TIME_DEPTH = 600 -E_LEVEL_MAX_CAPACITY = 50 -W_LEVEL_TIME_DEPTH = 500 -W_LEVEL_MAX_CAPACITY = 100 -I_LEVEL_TIME_DEPTH = 400 -I_LEVEL_MAX_CAPACITY = 200 -D_LEVEL_TIME_DEPTH = 30 -D_LEVEL_MAX_CAPACITY = 300 -V_LEVEL_TIME_DEPTH = 200 -V_LEVEL_MAX_CAPACITY = 400 - -# Xiaomi add for breaking xtra download limitation -XTRA_TEST_ENABLED = 1 -XTRA_THROTTLE_ENABLED = 0 -XTRA_SYSTEM_TIME_INJECT = 1 -# Mechanism to handle the gnss assistance data download -# in very bad network situations -XTRA_SOCK_KEEPALIVE=1 -################################################## -# Allow buffer diag log packets when diag memory allocation -# fails during boot up time. -################################################## -BUFFER_DIAG_LOGGING = 1 - -####################################### -# NTRIP CLIENT LIBRARY NAME -####################################### -# NTRIP_CLIENT_LIB_NAME = - -################################################## -# Correction Data Framework settings -# Default values: -# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM -# CDFW_INJECT_DATA_INTERVAL = 600000 //10 mins -# CDFW_RTCM_MESSAGE_INTERVAL = 1000 //1 second -# -# If multiple sources coexist on a PL, -# the prorioty sequence can be set by the integer number. -# PRIORITY_1 is higher than PRIORITY_2, for example, -# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM -# CDFW_SOURCE_PRIORITY_2 = CV2X RTCM -################################################## - -################################################## -# RF LOSS -# The loss in 0.1 dbHz from the C/N0 at the antenna port -# These values must be configured by OEM if not -# supported in QMI LOC message -# There is one entry for each signal type -################################################## -RF_LOSS_GPS = 0 -RF_LOSS_GPS_L5 = 0 -RF_LOSS_GLO_LEFT = 0 -RF_LOSS_GLO_CENTER = 0 -RF_LOSS_GLO_RIGHT = 0 -RF_LOSS_BDS = 0 -RF_LOSS_BDS_B2A = 0 -RF_LOSS_GAL = 0 -RF_LOSS_GAL_E5 = 0 -RF_LOSS_NAVIC = 0 diff --git a/configs/gps/izat.conf b/configs/gps/izat.conf index 932afba..9943c92 100644 --- a/configs/gps/izat.conf +++ b/configs/gps/izat.conf @@ -2,7 +2,7 @@ # Log verbosity control for izat modules ######################################### # OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5 -IZAT_DEBUG_LEVEL = 2 +IZAT_DEBUG_LEVEL = 5 ################################################## # Select WIFI Wait Timeout value in seconds for SUPL @@ -16,6 +16,13 @@ WIFI_WAIT_TIMEOUT_SELECT = 0 ################################################## LPPE_SRN_DATA_SCAN_INJECT_TIME=2 +################################################## +# Identify this target as OTA updated or new +# 0 - New target +# 1 - OTA updated +################################################## +OTA_UPDATED_TARGET=0 + ################################ # NLP Settings ################################ @@ -93,7 +100,6 @@ GTP_PRIVACY_RETRY_INTERVAL = 86400 # DISABLED # LEGACY_WWAN # SDK (WWAN not available for Modems before LocTech 10.0) -# SDK_WIFI (WWAN provided by legacy Modem) GTP_MODE=DISABLED #GTP_WAA valid modes: @@ -105,9 +111,8 @@ GTP_WAA=DISABLED # DISABLED # BASIC # PREMIUM -# PREMIUM_ENV_AIDING # MODEM_DEFAULT -SAP=PREMIUM +SAP=MODEM_DEFAULT #FREE_WIFI_SCAN_INJECT valid modes: #DISABLED @@ -181,7 +186,7 @@ IZAT_FEATURE_MASK=0xf303 PLATFORMS=all SOC_IDS=all BASEBAND=all -LOW_RAM_TARGETS=ENABLED +LOW_RAM_TARGETS=DISABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=0 @@ -192,9 +197,9 @@ PROCESS_GROUPS=inet gps PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xc03 PLATFORMS=all -SOC_IDS=all +SOC_IDS=all exclude 386 436 BASEBAND=all -LOW_RAM_TARGETS=ENABLED +LOW_RAM_TARGETS=DISABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=1 @@ -205,9 +210,9 @@ PROCESS_GROUPS=wifi inet gps system oem_2904 PREMIUM_FEATURE=1 IZAT_FEATURE_MASK=0xd03 PLATFORMS=all -SOC_IDS=all +SOC_IDS=all exclude 386 436 BASEBAND=all -LOW_RAM_TARGETS=ENABLED +LOW_RAM_TARGETS=DISABLED HARDWARE_TYPE=all VENDOR_ENHANCED_PROCESS=1 @@ -266,7 +271,7 @@ VENDOR_ENHANCED_PROCESS=1 PROCESS_NAME=engine-service PROCESS_ARGUMENT=PPE libepsimulator.so PROCESS_STATE=DISABLED -PROCESS_GROUPS=gps diag inet qwes oem_2901 system +PROCESS_GROUPS=gps diag inet oem_2901 PREMIUM_FEATURE=0 IZAT_FEATURE_MASK=0 PLATFORMS=all diff --git a/configs/gps/sap.conf b/configs/gps/sap.conf index e8d27b7..a077b3c 100644 --- a/configs/gps/sap.conf +++ b/configs/gps/sap.conf @@ -13,10 +13,6 @@ #RATE_RANDOM_WALK_SPECTRAL_DENSITY= #VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY= -# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info -# 4 - Debug, 5 - Verbose -# If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 0 # Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0) # used in loc_eng_reinit SENSOR_ACCEL_BATCHES_PER_SEC=2 @@ -37,7 +33,7 @@ SENSOR_CONTROL_MODE=2 # Setting each bit has the following definition: # 0x1 - DISABLE_INS_POSITIONING_FILTER # 0x0 - ENABLE_INS_POSITIONING_FILTER -SENSOR_ALGORITHM_CONFIG_MASK=0x0 +SENSOR_ALGORITHM_CONFIG_MASK=0x1 #Vehicle Network Provider configuration @@ -50,9 +46,7 @@ SENSOR_ALGORITHM_CONFIG_MASK=0x0 ################################################ # QDR3 configurations # ################################################ -#VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2 -#VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 -VN_SPEED_CFG=1:777,0,0,1,3,1,0.002778,0,40,8,32,8 +VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2 VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 ################################################ @@ -83,22 +77,22 @@ VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 # Batching type # 1 - Time based (default) # 2 - Count based -VN_CFG_BATCH_TYPE=1 +#VN_CFG_BATCH_TYPE=1 #Vehicle Accel batching value, it can either accept time in milli seconds or sample count #VN_ACCEL_CFG_BATCH_VALUE=100 #Vehicle Gyro batching value, it can either accept time in milli seconds or sample count -VN_GYRO_CFG_BATCH_VALUE=50 +#VN_GYRO_CFG_BATCH_VALUE=100 #Vehicle Odo batching value, it can either accept time in milli seconds or sample count #VN_ODOMETRY_CFG_BATCH_VALUE=100 #Vehicle Speed batching value, it can either accept time in milli seconds or sample count -VN_SPEED_CFG_BATCH_VALUE=50 +#VN_SPEED_CFG_BATCH_VALUE=100 #Vehicle Gear batching value, it can either accept time in milli seconds or sample count -VN_GEAR_CFG_BATCH_VALUE=50 +#VN_GEAR_CFG_BATCH_VALUE=100 #Vehicle DWS batching value, it can either accept time in milli seconds or sample count #VN_DWS_CFG_BATCH_VALUE=100 @@ -131,34 +125,22 @@ NDK_PROVIDER_TIME_SOURCE=1 COUNT_BASED_BATCHING=1 SYNC_ONCE=0 -# Vehicle Network Data optimization -# Default value: 0 -# Value 0x40000 - Speed(bit 18 eSLIM_SERVICE_VEHICLE_SPEED) -# Value 0x80000 - Speed(bit 19 eSLIM_SERVICE_VEHICLE_DWS) -# Value 0x100000 - Speed(bit 20 eSLIM_SERVICE_VEHICLE_GEAR) -VN_ENABLE_DATA_OPTIMIZATION=0x100000 - -# Vehicle Network Data Routing time interval -# This is applicable only if VN_ENABLE_DATA_OPTIMIZATION value is set -# Default value: 5000 msec -VN_DATA_ROUTING_TIME_INTERVAL_MSEC=3000 - #Sensor HAL Provider Configuration HAL Library name including path ################################################ # # # Configuration for BMI 160 Sensor # # # ################################################ -#SENSOR_TYPE=2 -#SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1 +SENSOR_TYPE=2 +SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1 ################################################ # # # Configuration for ASM330 Sensor # # # ################################################ -SENSOR_TYPE=1 -SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1 +#SENSOR_TYPE=1 +#SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1 ################################################ diff --git a/configs/keylayout/gpio-keys.kl b/configs/keylayout/gpio-keys.kl deleted file mode 100644 index 7d5afc3..0000000 --- a/configs/keylayout/gpio-keys.kl +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2013, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -key 115 VOLUME_UP -key 114 VOLUME_DOWN -key 102 HOME -key 528 FOCUS -key 766 CAMERA diff --git a/configs/keylayout/sm6150-idp-snd-card_Button_Jack.kl b/configs/keylayout/sm6150-idp-snd-card_Button_Jack.kl deleted file mode 100644 index 07cb901..0000000 --- a/configs/keylayout/sm6150-idp-snd-card_Button_Jack.kl +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2014, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -key 226 HEADSETHOOK -key 257 VOLUME_UP -key 258 VOLUME_DOWN diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml index 2025f97..9681121 100644 --- a/configs/media/media_codecs.xml +++ b/configs/media/media_codecs.xml @@ -118,299 +118,5 @@ Only the three quirks included above are recognized at this point: --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/configs/media/media_codecs_c2.xml b/configs/media/media_codecs_c2.xml deleted file mode 100644 index 1153cb0..0000000 --- a/configs/media/media_codecs_c2.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml index 31881e0..b8e484b 100644 --- a/configs/media/media_codecs_performance.xml +++ b/configs/media/media_codecs_performance.xml @@ -23,14 +23,14 @@ limitations under the License. - - + + - - + + @@ -42,7 +42,7 @@ limitations under the License. - + diff --git a/configs/media/media_codecs_performance_v2.xml b/configs/media/media_codecs_performance_v2.xml index a3220fd..69b2c76 100644 --- a/configs/media/media_codecs_performance_v2.xml +++ b/configs/media/media_codecs_performance_v2.xml @@ -175,14 +175,14 @@ limitations under the License. - + - + @@ -193,6 +193,8 @@ limitations under the License. + + @@ -204,7 +206,7 @@ limitations under the License. - + diff --git a/configs/media/media_codecs_system_default.xml b/configs/media/media_codecs_system_default.xml index 2d2b112..b91747e 100644 --- a/configs/media/media_codecs_system_default.xml +++ b/configs/media/media_codecs_system_default.xml @@ -87,11 +87,14 @@ Only the three quirks included above are recognized at this point: _________________________________________________________ | Codec | W H fps Mbps MB/s | |_____________|_________________________________________| - | h264 | 3840 2160 30 100 972000 | - | hevc | 3840 2160 30 100 972000 | + | h264 | 4096 2160 60 120 2073600 | + | | (4096) (2304) (30) (120) | + | hevc | 4096 2160 60 120 2073600 | + | | (4096) (2304) (30) (120) | | mpeg4-sw | 1920 1088 30 40 244800 | | vp8 | 1920 1088 60 100 489600 | - | vp9 | 3840 2160 30 100 972000 | + | vp9 | 4096 2160 60 120 2073600 | + | | (4096) (2304) (30) (120) | | vc1 | 1920 1088 30 20 244800 | | div4/5/6-sw | 1920 1088 30 10 244800 | | h263-sw | 864 480 30 16 48600 | @@ -112,8 +115,10 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 3840 2160 30 100 972000 | - | hevc | 3840 2160 30 100 972000 | + | h264 | 4096 2160 60 120 2073600 | + | | (4096) (2304) (30) (120) | + | hevc | 4096 2160 60 120 2073600 | + | | (4096) (2304) (30) (120) | | mpeg4-sw | 1280 720 30 4 108000 | | vp8 | 1920 1088 60 40 489600 | | h263-sw | 864 480 30 2 48600 | @@ -133,7 +138,7 @@ Only the three quirks included above are recognized at this point: - + @@ -144,6 +149,7 @@ Only the three quirks included above are recognized at this point: + @@ -158,12 +164,13 @@ Only the three quirks included above are recognized at this point: + - + @@ -176,6 +183,7 @@ Only the three quirks included above are recognized at this point: + @@ -188,6 +196,7 @@ Only the three quirks included above are recognized at this point: + @@ -204,6 +213,7 @@ Only the three quirks included above are recognized at this point: + @@ -218,6 +228,7 @@ Only the three quirks included above are recognized at this point: + @@ -232,43 +243,81 @@ Only the three quirks included above are recognized at this point: + - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + @@ -280,6 +329,7 @@ Only the three quirks included above are recognized at this point: + @@ -294,6 +344,7 @@ Only the three quirks included above are recognized at this point: + @@ -308,6 +359,7 @@ Only the three quirks included above are recognized at this point: + @@ -324,6 +376,7 @@ Only the three quirks included above are recognized at this point: + @@ -340,38 +393,75 @@ Only the three quirks included above are recognized at this point: + - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -386,6 +476,7 @@ Only the three quirks included above are recognized at this point: + @@ -399,6 +490,7 @@ Only the three quirks included above are recognized at this point: + @@ -409,6 +501,7 @@ Only the three quirks included above are recognized at this point: + @@ -422,6 +515,7 @@ Only the three quirks included above are recognized at this point: + @@ -434,6 +528,7 @@ Only the three quirks included above are recognized at this point: + @@ -447,6 +542,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/configs/media/media_profiles_vendor.xml b/configs/media/media_profiles_vendor.xml index 9617592..4bc082d 100644 --- a/configs/media/media_profiles_vendor.xml +++ b/configs/media/media_profiles_vendor.xml @@ -116,7 +116,7 @@ frameRate="30" />